unitf-tag 0.1.25 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7289107ae3745345d0485a0cd9dde05aec68cfe8a22ce366a45fe047467ad55f
-  data.tar.gz: 11f751c7a07a90b39589a03088589c48514734819e9318de36a4371bc7263049
+  metadata.gz: 0e8a3abd8e593009ee730ed4ee98c85f9f0b5665cdccf7ac1ea68b0f29e793a6
+  data.tar.gz: 2b62f8700524ba32f9961b14c129869a98b4e0fbf304c05173f9e059820d8bb3
 SHA512:
-  metadata.gz: e51cf3871b7fbe25c2f9adcc23389430cb02d1551cd61efcad6817209dc18723aa8f17282554e1af752db6af2e2adfdd043eabb4d54d3f1ced29651c0863146f
-  data.tar.gz: e397e4fb24ed3e2cce546c08a1d47b07dec9b1adaefd9df3b0f1ff7163591eb2485a7065603c2316169da240ab161edf5fe7e330f872b0de11d7bc6febb9704a
+  metadata.gz: d5a1dd21d9cddb72642a99e8d0f1274f6e95a3fc76e80d9bb71838c6addc201814ac3dd0ff1d38482af6464ab37eddd5cd643d70240bf7fdf5fba80866d9c156
+  data.tar.gz: 6e7d036234644964322c41dd0dcc4d8e9982c76c6abc4dd430c28a88431f635194da76826c153dcd249b6c0e4a0d26c2e2892b74f75f8063d7ece32fdb99cca7

data/.gitignore

@@ -8,8 +8,6 @@
 /tmp/
 Gemfile.lock
 *.gem
-*.mp3
-test-data/
 
 # rspec failure tracking
 .rspec_status

data/.vscode/tasks.json

@@ -16,10 +16,18 @@
       "presentation": {
         "clear": true
       },
-      "command": "bundle exec exe/tag --album FOO --year 2022 test-data"
+      "command": "bundle exec ruby bin/test.rb"
     },
     {
-      "label": "test-project",
+      "label": "tag-test",
+      "type": "shell",
+      "options": {
+        "cwd": "${workspaceFolder}",
+      },
+      "command": "bundle exec ruby exe/tag --auto_tag '/Users/mbaron/music2/Dinosaur Jr/Little Fury Things'"
+    },
+    {
+      "label": "rspec",
       "type": "shell",
       "presentation": {
         "clear": true

data/CHANGELOG.md

@@ -1,4 +1,11 @@
 # UnitF::Tag
 
+## v0.2.0
+- `UnitF::Tag::File` no longer inherits anything]
+- Spec Tests
+
+## v0.1.26
+- Completely re-do auto-tagging
+
 ## v0.1.22
 - Look for covers in current directory and parent directory

data/bin/test.rb

@@ -4,23 +4,7 @@ require 'unitf/tag'
 
 UnitF::Log.to_console
 
-UnitF::Tag.update('test-data/foo.mp3') do |file|
-  file.tag.artist = 'bar123'
-  file.tag.year = 1972
-  file.tag.album = 'This is the album'
-  file.tag.title = 'This is the title'
-  file.tag.track = 99
-  file.auto_cover!
-end
-
-file = UnitF::Tag::File.new('test-data/bar.mp3')
-# file.tag
-
-file.update do |f|
-  f.tag.title = 'Hello world2!'
-  f.tag.track = 100
-end
-
-file.open do |f|
-  f.tag.title = 'Hello world9!'
+UnitF::Tag.update('test-data/song.mp3') do |file|
+  puts "FILE: #{file}"
+  file.tag.artist = "Update #{Time.now.to_s}"
 end

data/docs/taglib.md

@@ -0,0 +1,47 @@
+# taglib Notes
+Notes on `taglib` and `taglib-ruby` issues
+
+**GitHub**
+- https://github.com/taglib/taglib
+- https://github.com/robinst/taglib-ruby
+
+## Custom TagLib 1.13.1 Build on MacOS
+```
+curl -O https://taglib.org/releases/taglib-1.13.1.tar.gz
+tar xvf taglib-1.13.1.tar.gz
+cd taglib-1.13.1
+cmake -DCMAKE_INSTALL_PREFIX=/usr/local/taglib1 -DCMAKE_BUILD_TYPE=Release .
+make
+sudo make install
+```
+
+```
+TAGLIB_DIR=/usr/local/taglib1 gem install taglib-ruby --version '< 2'
+```
+
+## Custom Build on Linux
+```
+git clone https://github.com/taglib/taglib.git
+cd taglib/
+git submodule update --init
+cmake -DCMAKE_INSTALL_PREFIX=/usr/local/taglib -DCMAKE_BUILD_TYPE=Release .
+make
+make install
+```
+
+```
+TAGLIB_DIR=/usr/local/taglib gem install taglib-ruby --version '>= 2'
+```
+
+### Taglib error w/ taglib 2.0.2
+```
+root@homer:/nas/music2/WFMU# gem install /tmp/unitf-tag-0.1.27.gem
+Successfully installed unitf-tag-0.1.27
+Parsing documentation for unitf-tag-0.1.27
+Installing ri documentation for unitf-tag-0.1.27
+Done installing documentation for unitf-tag after 0 seconds
+1 gem installed
+root@homer:/nas/music2/WFMU# tag
+<internal:/usr/share/rubygems/rubygems/core_ext/kernel_require.rb>:136:in `require': /usr/local/lib64/gems/ruby/taglib-ruby-2.0.0/taglib_base.so: undefined symbol: _ZN6TagLib4File11removeBlockElm - /usr/local/lib64/gems/ruby/taglib-ruby-2.0.0/taglib_base.so (LoadError)
+	from <internal:/usr/share/rubygems/rubygems/core_ext/kernel_require.rb>:136:in `require'
+```

data/exe/tag

@@ -54,6 +54,10 @@ targets = OptionParser.new do |opts|
     actions << :auto_tag
   end
 
+  opts.on('--auto_tags', 'Auto Tags') do
+    actions << :auto_tags
+  end
+
   opts.on('-f', '--force', 'Force') do
     opt[:force] = true
   end
@@ -96,19 +100,22 @@ end
 
 files.each do |file|
   UnitF::Log.info("Processing file: #{file}")
-  file.update do |o|
-    o.properties!(properties) unless properties.empty?
+
+  file.update do |f|
+    f.properties!(properties) unless properties.empty?
 
     actions.each do |action|
       case action
       when :cover
-        o.cover!(opt[:cover])
+        f.cover!(opt[:cover])
       when :delete_cover
-        o.delete_cover!
+        f.delete_cover!
       when :auto_cover
-        o.auto_cover!
+        f.auto_cover!
       when :auto_tag
-        o.auto_tag!
+        f.auto_tag!
+      when :auto_tags
+        puts "\tauto_tags: #{f.auto_tags}\n\n"
       end
     end
   end

data/lib/unitf/tag/auto_tags.rb

@@ -0,0 +1,62 @@
+module UnitF
+  module Tag
+    class AutoTags < Hash
+      def initialize(file_path)
+        super
+
+        @file_path = ::File.realpath(file_path.to_s)
+        @dirname = ::File.dirname(@file_path)
+
+        merge!(from_path)
+        merge!(from_file)
+      end
+
+      def auto_tag_path
+        return @auto_tag_path unless @auto_tag_path.nil?
+
+        ["#{@dirname}/.autotag", "#{@dirname}/../.autotag"].each do |path|
+          return @auto_tag_path = path if ::File.exist?(path)
+        end
+
+        nil
+      end
+
+      def from_path
+        tags = {}
+
+        tags[:title] = ::File.basename(@file_path)
+        tags[:track] = tags[:title].match(/^\s*\d+/).to_s.to_i
+
+        # Specific formatting for dated radio
+        if tags[:title].scan(/(\.|_|-)((\d\d\d\d)(\.|-)\d\d(\.|-)\d\d(\w*))\./).any?
+          tags[:title] = ::Regexp.last_match[2]
+          tags[:year] = ::Regexp.last_match[3].to_i
+        else
+          tags[:title].gsub!(/\.\w+$/, '')
+          tags[:title].gsub!(/^\d*\s*(-|\.)*\s*/, '')
+        end
+
+        path_parts = @dirname.to_s.split('/')
+        tags[:artist] = path_parts[-2]
+        tags[:album] = path_parts[-1]
+
+        tags
+      end
+
+      def from_file
+        tags = {}
+        return tags unless ::File.exist?(auto_tag_path)
+
+        ::File.read(auto_tag_path).each_line do |line|
+          line.chomp!
+          tag, value = line.split(/\s*=\s*/)
+          tags[tag.strip.to_sym] = value.strip
+        end
+
+        tags
+      rescue StandardError
+        {}
+      end
+    end
+  end
+end

data/lib/unitf/tag/file.rb

@@ -6,24 +6,22 @@ require 'json'
 
 module UnitF
   module Tag
-    class File < Pathname
+    class File
+      attr_accessor :path, :realpath, :dirname, :extname
+
       def initialize(file_path)
-        super(::File.absolute_path(file_path.to_s))
-      end
+        raise Error, "Invalid file #{file_path}" unless ::File.exist?(file_path)
 
-      def tag
-        raise Error, "File is not open #{self.class.name}" if @file&.tag.nil?
+        @path = ::File.path(file_path.to_s)
+        @realpath = ::File.realpath(path)
+        @dirname = ::File.dirname(path)
+        @extname = ::File.extname(path)
 
-        @file&.tag
+        raise Error, "Unknown file type: #{file_path}" unless mp3? || flac?
       end
 
-      def save
-        @file&.save
-      end
-
-      def close
-        @file&.close
-        @file = nil
+      def to_s
+        @path
       end
 
       def format_json
@@ -40,7 +38,7 @@ module UnitF
 
       def info
         {
-          file: realpath.to_path,
+          file: realpath,
           artist: tag.artist,
           album: tag.album,
           title: tag.title,
@@ -68,12 +66,8 @@ module UnitF
         ["#{dirname}/cover.jpg", "#{dirname}/../cover.jpg"].each do |path|
           return ::File.realpath(path) if ::File.exist?(path)
         end
-      end
 
-      def auto_tag_path
-        ["#{dirname}/.autotag", "#{dirname}/../.autotag"].each do |path|
-          return ::File.realpath(path) if ::File.exist?(path)
-        end
+        nil
       end
 
       def mp3?
@@ -85,104 +79,34 @@ module UnitF
       end
 
       def cover_available?
-        cover_path != nil
+        !cover_path.nil?
       end
 
       def auto_cover!
         raise Error, "File is not open #{self.class.name}" if tag.nil?
 
-        cover!(cover_path)
+        cover!(cover_path) if cover_available?
         true
       rescue StandardError => e
         UnitF::Log.error("Failed to auto-cover file #{e}")
+        puts e.backtrace
         false
       end
 
-      def manual_auto_tags
-        UnitF::Log.info(auto_tag_path)
-        tags = {}
-        return {} unless ::File.exist?(auto_tag_path)
-        ::File.read(auto_tag_path).each_line do |line|
-          line.chomp!
-          UnitF::Log.info(line)
-          tag, value = line.split(/\s*=\s*/)
-          tags[tag.to_sym] = value
-        end
-        tags
-      rescue StandardError
-        {}
-      end
-
-      # def auto_tags
-      #   manual_tags = manual_auto_tags
-      #   tags = {}
-
-      #   tags[:title] = ::File.basename(realpath.to_path)
-      #   track = tags[:title].match(/^\s*\d+/).to_s.to_i
-
-      #   if tags[:title].scan(/(\.|_|-)(\d\d\d\d(\.|-)\d\d(\.|-)\d\d)/)
-      #     tags[:title] = ::Regexp::last_match
-      #   else
-      #     tags[:title].gsub!(/\.\w+$/, '')
-      #     tags[:title].gsub!(/^\d*\s*(-|\.)*\s*/, '')
-      #   end
-
-      #   path_parts = realpath.dirname.to_path.split('/')
-      #   tags[:album] = path_parts[-1]
-      #   tags[:artist] = path_parts[-2]
-
-      #   tags.merge(manual_auto_tags)
-      # end
-
-      def path_tags
-        tags = {}
-
-        tags[:title] = ::File.basename(realpath.to_path)
-        tags[:track] = tags[:title].match(/^\s*\d+/).to_s.to_i
-
-        # Specific formatting for dated radio
-        if tags[:title].scan(/(\.|_|-)((\d\d\d\d)(\.|-)\d\d(\.|-)\d\d(\w*))\./).any?
-          tags[:title] = ::Regexp.last_match[2]
-          tags[:year] = ::Regexp.last_match[3].to_i
-        else
-          tags[:title].gsub!(/\.\w+$/, '')
-          tags[:title].gsub!(/^\d*\s*(-|\.)*\s*/, '')
-        end
-
-        tags[:artist] = path_parts[-2]
-        tags[:album] = tags[:album_artist] = path_parts[-1]
+      def auto_tags
+        @auto_tags ||= UnitF::Tag::AutoTags.new(path)
       end
 
       def auto_tag!
         UnitF::Log.info("Auto tagging #{self}")
+        UnitF::Log.info(auto_tags)
 
-        title = ::File.basename(realpath.to_path)
-        path_parts = realpath.dirname.to_path.split('/')
-
-        year = nil
-
-        # This must come before gsubbing the title
-        track = title.match(/^\s*\d+/).to_s.to_i
-
-        # Specific formatting for dated radio
-        if title.scan(/(\.|_|-)((\d\d\d\d)(\.|-)\d\d(\.|-)\d\d(\w*))\./).any?
-          title = ::Regexp.last_match[2]
-          album = path_parts[-1]
-          year = ::Regexp.last_match[3].to_i
-        else
-          title.gsub!(/\.\w+$/, '')
-          title.gsub!(/^\d*\s*(-|\.)*\s*/, '')
-          album = path_parts[-1]
-        end
-
-        artist = path_parts[-2]
-
-        tag.year = year unless year.nil?
-        tag.album = album
-        tag.artist = artist
-        tag.title = title
-        tag.track = track if track.positive?
-        self.album_artist = artist
+        tag.album = auto_tags[:album]
+        tag.artist = auto_tags[:artist]
+        tag.title = auto_tags[:title]
+        tag.track = auto_tags[:track] if auto_tags.key?(:track)
+        tag.year = auto_tags[:year] if auto_tags.key?(:year)
+        self.album_artist = auto_tags[:artist]
       end
 
       def properties!(properties)
@@ -193,21 +117,45 @@ module UnitF
       end
 
       def update
-        open(auto_save: true) do |file|
-          yield(file) if block_given?
+        open do |file|
+          if block_given?
+            yield(file)
+            file.save || (raise Error, "Failed to save file #{file}")
+          end
         end
       end
 
-      def open(auto_save: false)
+      def open
         file = if flac?
-                   UnitF::Tag::FLAC.new(to_path)
-                 elsif mp3?
-                   UnitF::Tag::MP3.new(to_path)
-                 end
+                 UnitF::Tag::FLAC.new(path)
+               elsif mp3?
+                 UnitF::Tag::MP3.new(path)
+               end
         yield(file) if block_given?
-        file.save if auto_save
         file.close
       end
+
+      #
+      # Methods that use @file, which comes from child classes
+      #
+      def tag
+        raise Error, "File is not open #{self.class.name}" if @file&.tag.nil?
+
+        @file&.tag
+      end
+
+      def save
+        raise Error, "File is not open #{self.class.name}" if @file&.tag.nil?
+
+        @file&.save
+      end
+
+      def close
+        raise Error, "File is not open #{self.class.name}" if @file&.tag.nil?
+
+        @file&.close
+        @file = nil
+      end
     end
   end
 end

data/lib/unitf/tag/mp3.rb

@@ -23,6 +23,10 @@ module UnitF
       end
 
       def cover!(file_path)
+        return unless ::File.exist?(file_path.to_s)
+
+        delete_cover! if cover?
+
         UnitF::Log.info("Setting cover #{file_path}")
         apic = TagLib::ID3v2::AttachedPictureFrame.new
         apic.mime_type = 'image/jpeg'

data/lib/unitf/tag/version.rb

@@ -2,6 +2,6 @@
 
 module Unitf
   module Tag
-    VERSION = '0.1.25'
+    VERSION = '0.2.0'
   end
 end

data/lib/unitf/tag.rb

@@ -6,6 +6,7 @@ require_relative 'tag/file'
 require_relative 'tag/fileset'
 require_relative 'tag/flac'
 require_relative 'tag/mp3'
+require_relative 'tag/auto_tags'
 
 require 'unitf/logging'
 
@@ -15,7 +16,6 @@ module UnitF
       def update(file_path)
         UnitF::Tag::File.new(file_path).update do |file|
           yield file
-          file.save || (raise UnitF::Tag::Error, "Failed to save file #{file_path}")
         end
       end
 

data/test-data/Foo/Bar/.autotag

@@ -0,0 +1,2 @@
+artist=Custom Artist
+album=Custom Album

data/unitf-tag.gemspec

@@ -27,7 +27,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  #spec.add_dependency 'taglib-ruby', '1.1.2'
-  spec.add_dependency 'taglib-ruby'
+  spec.add_dependency 'logger'
+  spec.add_dependency 'taglib-ruby', '1.1.3'
+  # spec.add_dependency 'taglib-ruby', '>= 2.0.0'
   spec.add_dependency 'unitf-logging'
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: unitf-tag
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.2.0
 platform: ruby
 authors:
 - Matt Baron
 bindir: exe
 cert_chain: []
-date: 2025-03-24 00:00:00.000000000 Z
+date: 2025-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: taglib-ruby
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -23,6 +23,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: taglib-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: unitf-logging
   requirement: !ruby/object:Gem::Requirement
@@ -57,9 +71,11 @@ files:
 - README.md
 - Rakefile
 - bin/test.rb
+- docs/taglib.md
 - exe/tag
 - exe/unitf-autotags
 - lib/unitf/tag.rb
+- lib/unitf/tag/auto_tags.rb
 - lib/unitf/tag/export/exporter.rb
 - lib/unitf/tag/file.rb
 - lib/unitf/tag/fileset.rb
@@ -67,6 +83,12 @@ files:
 - lib/unitf/tag/helpers.rb
 - lib/unitf/tag/mp3.rb
 - lib/unitf/tag/version.rb
+- test-data/Foo/Bar/.autotag
+- test-data/Foo/Bar/2025/qq250916.mp3
+- test-data/Test Artist/Test Album/04 - Test Song.mp3
+- test-data/WFMU/BJ/2025/bj250915.mp3
+- test-data/cover.jpg
+- test-data/song.mp3
 - unitf-tag.gemspec
 homepage: https://github.com/mattbaron/unitf-tag
 licenses: