unitf-tag 0.1.9 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3349c41222239a0d71175ea75b37345f768376f08d7b6621f5b28afc599804b9
-  data.tar.gz: 57ee77221f0b63bc6238d889fe2cf5b6c1de899a02f082b6443c49ccbfe5d1de
+  metadata.gz: 7b16a3b7f4448536620cf9bc5ac134c082a9bfd61a7bd57e685d254397d97412
+  data.tar.gz: 253ac7cc3eabd4e6a812c76588854aff868aac9dd422434a0fc0175a55adab0b
 SHA512:
-  metadata.gz: 8aa4cc77d47945d7b8a5b53f2e5d979038ae2279e82f7cb4a31482f9f8e7205aab31249f17c8bccb30a6b260a3406c849059b56c399210eae22d61683eae0fe1
-  data.tar.gz: c6fd219e909d0baaa167902e7032109af3f164c522ed113c1c5fa109572342339b3efcf6549cc7133f9ec39c3a2764966b8350b1ef554a23f361dc14827d862d
+  metadata.gz: 58f21090b63069f22238a98a75b8545f6a2652428982025b562ef73ef80fdd7af54b363887c60be2f13f124dc0e33853d59e2e8778b533b600280e3624ca3848
+  data.tar.gz: 013d2107a8fe2ce6b68b15f6a5d490cda5a4b2b90d591641c062519172f4c63874834fc30d2f68bbf81ae330622849e83aaf034db31045ea8b530778a954581c

data/.vscode/tasks.json

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

data/bin/test.rb

@@ -4,7 +4,8 @@ require 'unitf/tag'
 
 UnitF::Log.to_console
 
-UnitF::Tag::File.update('/Users/mbaron/tmp/foo.mp3') do |tag|
-  tag.artist = 'bar123'
-  tag.year = 1972
+UnitF::Tag.update('/Users/mbaron/tmp/foo.mp3') do |file|
+  file.tag.artist = 'bar123'
+  file.tag.year = 1972
+  file.auto_cover!
 end

data/exe/tag

@@ -13,6 +13,8 @@ actions = []
 files = []
 opt = {}
 
+no_args = ARGV.size.zero?
+
 targets = OptionParser.new do |opts|
   opts.on('-r', '--recursive', 'Auto Cover') do
     opt[:recursive] = true
@@ -34,6 +36,12 @@ targets = OptionParser.new do |opts|
     opt[:format] = :line
   end
 
+  opts.on('--cover COVER', 'Cover') do |arg|
+    actions << :cover
+    raise "Invalid cover file #{arg}" unless ::File.exist?(arg) && arg.downcase.end_with?('.jpg')
+    opt[:cover] = arg
+  end
+
   opts.on('--auto_cover', 'Auto Cover') do
     actions << :auto_cover
   end
@@ -74,8 +82,15 @@ targets = OptionParser.new do |opts|
     actions << :genre
     opt[:genre] = arg
   end
+
+  opts.on('--track TRACK', 'Song Track') do |arg|
+    actions << :track
+    opt[:track] = arg.to_i
+  end
 end.parse!
 
+targets = Dir.glob('*') if no_args
+
 files = UnitF::Tag::FileSet.new(targets)
 
 if files.size.zero?
@@ -92,6 +107,9 @@ files.each do |file|
   file.open do |o|
     actions.each do |action|
       case action
+      when :cover
+        UnitF::Log.info("Cover #{opt[:cover]}")
+        o.cover!(opt[:cover])
       when :delete_cover
         UnitF::Log.info('Delete cover')
         o.delete_cover!
@@ -105,7 +123,7 @@ files.each do |file|
           end
         end
       when :auto_tag
-        UnitF::Log.info('Auto Tag')
+        UnitF::Log.info("Auto Tag #{file}")
         o.auto_tag!
       when :artist
         UnitF::Log.info("Setting artist to #{opt[:artist]}")
@@ -121,7 +139,7 @@ files.each do |file|
         o.tag.genre = opt[:genre]
       when :track
         UnitF::Log.info("Setting track to #{opt[:track]}")
-        o.tag.genre = opt[:track]
+        o.tag.track = opt[:track]
       when :year
         UnitF::Log.info("Setting year to #{opt[:year]}")
         o.tag.year = opt[:year]

data/exe/unitf-autotags

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift("#{__dir__}/../lib")
+
+require 'logger'
+require 'optparse'
+require 'unitf/tag'
+require 'unitf/logging'
+
+UnitF::Log.to_console
+
+files = UnitF::Tag::FileSet.new(ARGV)
+
+files.each do |file|
+  puts "File: #{file}"
+  puts "Tags: #{file.auto_tags}"
+end

data/lib/unitf/tag/file.rb

@@ -11,20 +11,6 @@ module UnitF
         super(::File.absolute_path(file_path.to_s))
       end
 
-      def update
-        open do |file|
-          yield file.tag
-          file.save || (raise UnitF::Tag::Error, "Failed to save file #{@file}")
-        end
-      end
-
-      def self.update(file_path)
-        UnitF::Tag::File.new(file_path).open do |file|
-          yield file.tag
-          file.save || (raise UnitF::Tag::Error, "Failed to save file #{file_path}")
-        end
-      end
-
       def tag
         @file.tag
       end
@@ -72,7 +58,7 @@ module UnitF
       end
 
       def auto_tag_path
-        "#{dirname}/.autotag"
+        "#{dirname}/.autotag.json"
       end
 
       def mp3?
@@ -88,26 +74,24 @@ module UnitF
       end
 
       def auto_cover!
-        cover!(cover_path)
-      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
-        {}
-      end
+        cover!(cover_path) if cover_available?
+      end
+
+      # def auto_tag_override
+      #   tags = {}
+      #   return {} unless ::File.exist?(auto_tag_path)
+      #   ::File.read(auto_tag_path).each_line do |line|
+      #     line.strip!
+      #     # UnitF::Log.info(line)
+      #     tag, value = line.split(/\s*=\s*/)
+      #     tags[tag.to_sym] = value
+      #   end
+      #   tags
+      # rescue
+      #   {}
+      # end
 
       def auto_tags
-        manual_tags = manual_auto_tags
         tags = {}
 
         tags[:title] = ::File.basename(realpath.to_path)
@@ -118,30 +102,20 @@ module UnitF
         tags[:album] = path_parts[-1]
         tags[:artist] = path_parts[-2]
 
-        tags.merge(manual_auto_tags)
+        begin
+          tags.merge!(JSON.parse(::File.read(auto_tag_path), symbolize_names: true))
+        rescue; end
+
+        tags
       end
 
       def auto_tag!
-        UnitF::Log.info("Auto tagging #{to_s}")
-        manual_auto_tags
-
-        title = ::File.basename(realpath.to_path)
-
-        # This must come before gsubbing the title
-        track = title.match(/^\s*\d+/).to_s.to_i
-
-        title.gsub!(/\.\w+$/, '')
-        title.gsub!(/^\d*\s*(-|\.)*\s*/, '')
-
-        path_parts = realpath.dirname.to_path.split('/')
-        album = path_parts[-1]
-        artist = path_parts[-2]
-
-        tag.album = album
-        tag.artist = artist
-        tag.title = title
-        tag.track = track
-        self.album_artist = artist
+        tags = auto_tags
+        tag.album = tags[:album]
+        tag.artist = tags[:artist]
+        tag.title = tags[:title]
+        tag.track = tags[:track] unless tags[:track].nil?
+        self.album_artist = tags[:artist]
       end
 
       def save

data/lib/unitf/tag/version.rb

@@ -2,6 +2,6 @@
 
 module Unitf
   module Tag
-    VERSION = "0.1.9"
+    VERSION = "0.1.16"
   end
 end

data/lib/unitf/tag.rb

@@ -21,6 +21,13 @@ module UnitF
       @logger
     end
 
+    def self.update(file_path)
+      UnitF::Tag::File.new(file_path).open do |file|
+        yield file
+        file.save || (raise UnitF::Tag::Error, "Failed to save file #{file_path}")
+      end
+    end
+
     def self.valid_file?(file_path)
       ::File.file?(file_path) && file_path.encode.match(/\.(flac|mp3)$/i)
     rescue ArgumentError => e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unitf-tag
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.16
 platform: ruby
 authors:
 - Matt Baron
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-11 00:00:00.000000000 Z
+date: 2023-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: taglib-ruby
@@ -43,6 +43,7 @@ email:
 - mwb@unitf.net
 executables:
 - tag
+- unitf-autotags
 extensions: []
 extra_rdoc_files: []
 files:
@@ -60,6 +61,7 @@ files:
 - bin/setup
 - bin/test.rb
 - exe/tag
+- exe/unitf-autotags
 - lib/unitf/tag.rb
 - lib/unitf/tag/export/exporter.rb
 - lib/unitf/tag/file.rb