unitf-tag 0.1.27 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14e1d8e28d9848b67e6bb7d268d1fa8e6218d61c72222c9f46a54cfec761648b
-  data.tar.gz: b012aacd324ab95d197f3d4b5bd683157693cb05919908256ad3d317d66f1c29
+  metadata.gz: 0e8a3abd8e593009ee730ed4ee98c85f9f0b5665cdccf7ac1ea68b0f29e793a6
+  data.tar.gz: 2b62f8700524ba32f9961b14c129869a98b4e0fbf304c05173f9e059820d8bb3
 SHA512:
-  metadata.gz: 5600015d8ceb5a8cf60a498a77f430127a130d4371751a0407540084f59cfc5f2a9c1c58d022ef6f65d3f7f5a90375fdab901544c72879d2fa172af6d025dc8f
-  data.tar.gz: 040ec01ad18ef917a39b9c36f981df172b48c3ff817c065ab595d8445fa9d1cc15ee12b3224c3446cecdf52a5a42a9e7b24d70f90025e7d8cbd4841339c2a45a
+  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

@@ -27,7 +27,7 @@
       "command": "bundle exec ruby exe/tag --auto_tag '/Users/mbaron/music2/Dinosaur Jr/Little Fury Things'"
     },
     {
-      "label": "test-project",
+      "label": "rspec",
       "type": "shell",
       "presentation": {
         "clear": true

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # UnitF::Tag
 
+## v0.2.0
+- `UnitF::Tag::File` no longer inherits anything]
+- Spec Tests
+
 ## v0.1.26
 - Completely re-do auto-tagging
 

data/bin/test.rb

@@ -4,10 +4,7 @@ require 'unitf/tag'
 
 UnitF::Log.to_console
 
-# file = UnitF::Tag::File.new('/Users/mbaron/music2/BJ/2025/foo/bar/../../bj250321.mp3')
-
-# puts file.auto_tags
-
-# file.update do |f|
-#   f.auto_tag!
-# end
+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

@@ -100,21 +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: #{o.auto_tags}\n\n"
+        puts "\tauto_tags: #{f.auto_tags}\n\n"
       end
     end
   end

data/lib/unitf/tag/auto_tags.rb

@@ -1,12 +1,11 @@
 module UnitF
   module Tag
     class AutoTags < Hash
-      def initialize(pathname)
+      def initialize(file_path)
         super
 
-        pathname = Pathname.new(pathname) if pathname.is_a?(String)
-        @pathname = pathname.realpath
-        @dirname = pathname.realpath.dirname
+        @file_path = ::File.realpath(file_path.to_s)
+        @dirname = ::File.dirname(@file_path)
 
         merge!(from_path)
         merge!(from_file)
@@ -25,7 +24,7 @@ module UnitF
       def from_path
         tags = {}
 
-        tags[:title] = ::File.basename(@pathname)
+        tags[:title] = ::File.basename(@file_path)
         tags[:track] = tags[:title].match(/^\s*\d+/).to_s.to_i
 
         # Specific formatting for dated radio
@@ -39,7 +38,7 @@ module UnitF
 
         path_parts = @dirname.to_s.split('/')
         tags[:artist] = path_parts[-2]
-        tags[:album] = tags[:album_artist] = path_parts[-1]
+        tags[:album] = path_parts[-1]
 
         tags
       end

data/lib/unitf/tag/file.rb

@@ -6,24 +6,22 @@ require 'json'
 
 module UnitF
   module Tag
-    class File < Pathname
-      def initialize(file_path)
-        super(::File.absolute_path(file_path.to_s))
-      end
+    class File
+      attr_accessor :path, :realpath, :dirname, :extname
 
-      def tag
-        raise Error, "File is not open #{self.class.name}" if @file&.tag.nil?
+      def initialize(file_path)
+        raise Error, "Invalid file #{file_path}" unless ::File.exist?(file_path)
 
-        @file&.tag
-      end
+        @path = ::File.path(file_path.to_s)
+        @realpath = ::File.realpath(path)
+        @dirname = ::File.dirname(path)
+        @extname = ::File.extname(path)
 
-      def save
-        @file&.save
+        raise Error, "Unknown file type: #{file_path}" unless mp3? || flac?
       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,
@@ -91,15 +89,18 @@ module UnitF
         true
       rescue StandardError => e
         UnitF::Log.error("Failed to auto-cover file #{e}")
+        puts e.backtrace
         false
       end
 
       def auto_tags
-        @auto_tags ||= UnitF::Tag::AutoTags.new(self)
+        @auto_tags ||= UnitF::Tag::AutoTags.new(path)
       end
 
       def auto_tag!
         UnitF::Log.info("Auto tagging #{self}")
+        UnitF::Log.info(auto_tags)
+
         tag.album = auto_tags[:album]
         tag.artist = auto_tags[:artist]
         tag.title = auto_tags[:title]
@@ -116,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/version.rb

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

data/lib/unitf/tag.rb

@@ -16,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

@@ -1,10 +1,6 @@
 # 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'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: unitf-tag
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.2.0
 platform: ruby
 authors:
 - Matt Baron
 bindir: exe
 cert_chain: []
-date: 2025-03-27 00:00:00.000000000 Z
+date: 2025-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -71,6 +71,7 @@ files:
 - README.md
 - Rakefile
 - bin/test.rb
+- docs/taglib.md
 - exe/tag
 - exe/unitf-autotags
 - lib/unitf/tag.rb
@@ -82,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: