unitf-tag 0.1.25 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7289107ae3745345d0485a0cd9dde05aec68cfe8a22ce366a45fe047467ad55f
-  data.tar.gz: 11f751c7a07a90b39589a03088589c48514734819e9318de36a4371bc7263049
+  metadata.gz: 14e1d8e28d9848b67e6bb7d268d1fa8e6218d61c72222c9f46a54cfec761648b
+  data.tar.gz: b012aacd324ab95d197f3d4b5bd683157693cb05919908256ad3d317d66f1c29
 SHA512:
-  metadata.gz: e51cf3871b7fbe25c2f9adcc23389430cb02d1551cd61efcad6817209dc18723aa8f17282554e1af752db6af2e2adfdd043eabb4d54d3f1ced29651c0863146f
-  data.tar.gz: e397e4fb24ed3e2cce546c08a1d47b07dec9b1adaefd9df3b0f1ff7163591eb2485a7065603c2316169da240ab161edf5fe7e330f872b0de11d7bc6febb9704a
+  metadata.gz: 5600015d8ceb5a8cf60a498a77f430127a130d4371751a0407540084f59cfc5f2a9c1c58d022ef6f65d3f7f5a90375fdab901544c72879d2fa172af6d025dc8f
+  data.tar.gz: 040ec01ad18ef917a39b9c36f981df172b48c3ff817c065ab595d8445fa9d1cc15ee12b3224c3446cecdf52a5a42a9e7b24d70f90025e7d8cbd4841339c2a45a

data/.vscode/tasks.json

@@ -16,7 +16,15 @@
       "presentation": {
         "clear": true
       },
-      "command": "bundle exec exe/tag --album FOO --year 2022 test-data"
+      "command": "bundle exec ruby bin/test.rb"
+    },
+    {
+      "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": "test-project",

data/CHANGELOG.md

@@ -1,4 +1,7 @@
 # UnitF::Tag
 
+## 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,10 @@ 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('/Users/mbaron/music2/BJ/2025/foo/bar/../../bj250321.mp3')
 
-file = UnitF::Tag::File.new('test-data/bar.mp3')
-# file.tag
+# puts file.auto_tags
 
-file.update do |f|
-  f.tag.title = 'Hello world2!'
-  f.tag.track = 100
-end
-
-file.open do |f|
-  f.tag.title = 'Hello world9!'
-end
+# file.update do |f|
+#   f.auto_tag!
+# end

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
@@ -109,6 +113,8 @@ files.each do |file|
         o.auto_cover!
       when :auto_tag
         o.auto_tag!
+      when :auto_tags
+        puts "\tauto_tags: #{o.auto_tags}\n\n"
       end
     end
   end

data/lib/unitf/tag/auto_tags.rb

@@ -0,0 +1,63 @@
+module UnitF
+  module Tag
+    class AutoTags < Hash
+      def initialize(pathname)
+        super
+
+        pathname = Pathname.new(pathname) if pathname.is_a?(String)
+        @pathname = pathname.realpath
+        @dirname = pathname.realpath.dirname
+
+        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(@pathname)
+        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] = tags[:album_artist] = 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

@@ -68,12 +68,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 +81,31 @@ 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}")
         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(self)
       end
 
       def auto_tag!
         UnitF::Log.info("Auto tagging #{self}")
-
-        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)

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.1.27'
   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'
 

data/unitf-tag.gemspec

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 require_relative 'lib/unitf/tag/version'
+# require 'rbconfig'
+
+# taglib_ruby_version = '>= 2.0.0' unless RbConfig::CONFIG['host_os'].match?(/linux/)
+# taglib_ruby_version = '1.1.3' if RbConfig::CONFIG['host_os'].match?(/linux/)
 
 Gem::Specification.new do |spec|
   spec.name          = 'unitf-tag'
@@ -27,7 +31,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.1.27
 platform: ruby
 authors:
 - Matt Baron
 bindir: exe
 cert_chain: []
-date: 2025-03-24 00:00:00.000000000 Z
+date: 2025-03-27 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
@@ -60,6 +74,7 @@ files:
 - 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