unitf-tag 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da63e27abbe2ad5f02751954906494623640d52ebee71c99cdde24e0e5cc9b45
-  data.tar.gz: b6c8833b6a6c692fa584ba68e058cc0aa69f29b192d8d26b52bfa2c31e080dbb
+  metadata.gz: 3349c41222239a0d71175ea75b37345f768376f08d7b6621f5b28afc599804b9
+  data.tar.gz: 57ee77221f0b63bc6238d889fe2cf5b6c1de899a02f082b6443c49ccbfe5d1de
 SHA512:
-  metadata.gz: 4e2bf3be1deb74914640c50e2fe3c424973742a48a0d006e889eae7b57b9cceb996897e1d431c02fe694fa2999a1f80fc161ef27fa1beab475f7d76e5eebd437
-  data.tar.gz: da3d156c8dd3d507588d11e2eee893d24952ea31f611ac556010793442174f2a93b32f3b55e508d44a555b6125a7a2e799686962e12acbea2681af443980dd87
+  metadata.gz: 8aa4cc77d47945d7b8a5b53f2e5d979038ae2279e82f7cb4a31482f9f8e7205aab31249f17c8bccb30a6b260a3406c849059b56c399210eae22d61683eae0fe1
+  data.tar.gz: c6fd219e909d0baaa167902e7032109af3f164c522ed113c1c5fa109572342339b3efcf6549cc7133f9ec39c3a2764966b8350b1ef554a23f361dc14827d862d

data/.gitignore

@@ -6,6 +6,8 @@
 /pkg/
 /spec/reports/
 /tmp/
+Gemfile.lock
+*.gem
 
 # rspec failure tracking
 .rspec_status

data/.rubocop.yml

@@ -7,3 +7,8 @@ Style/Documentation:
 Style/FrozenStringLiteralComment:
   Enabled: false
 
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/AbcSize: 
+  Enabled: false

data/.vscode/tasks.json

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

data/bin/test.rb

@@ -2,10 +2,9 @@ require 'optparse'
 
 require 'unitf/tag'
 
-file_str = '/Users/mbaron/tag/music/fIREHOSE3/Sometimes/01 - Sometimes.flac'
+UnitF::Log.to_console
 
-file = UnitF::Tag::FLAC.new(file_str)
-
-file.open do |o|
-  pp o.info
-end
+UnitF::Tag::File.update('/Users/mbaron/tmp/foo.mp3') do |tag|
+  tag.artist = 'bar123'
+  tag.year = 1972
+end

data/exe/tag

@@ -5,8 +5,9 @@ $LOAD_PATH.unshift("#{__dir__}/../lib")
 require 'logger'
 require 'optparse'
 require 'unitf/tag'
+require 'unitf/logging'
 
-logger = Logger.new($stdout)
+UnitF::Log.to_console
 
 actions = []
 files = []
@@ -64,6 +65,11 @@ targets = OptionParser.new do |opts|
     opt[:title] = arg
   end
 
+  opts.on('--year YEAR', 'Song Year') do |arg|
+    actions << :year
+    opt[:year] = arg.to_i
+  end
+
   opts.on('--genre GENRE', 'Genre') do |arg|
     actions << :genre
     opt[:genre] = arg
@@ -73,7 +79,7 @@ end.parse!
 files = UnitF::Tag::FileSet.new(targets)
 
 if files.size.zero?
-  logger.error('Cannot find any files to operate on')
+  UnitF::Log.error('Cannot find any files to operate on')
 end
 
 if actions.size.zero?
@@ -82,42 +88,45 @@ if actions.size.zero?
 end
 
 files.each do |file|
-  logger.info("Processing file: #{file}")
+  UnitF::Log.info("Processing file: #{file}")
   file.open do |o|
     actions.each do |action|
       case action
       when :delete_cover
-        logger.info('Delete cover')
+        UnitF::Log.info('Delete cover')
         o.delete_cover!
       when :auto_cover
         unless o.cover?
-          logger.info("Auto Cover #{file.cover_path}")
+          UnitF::Log.info("Auto Cover #{file.cover_path}")
           begin
             o.auto_cover!
           rescue => e
-            logger.error("Failed to auto-cover file #{e}")
+            UnitF::Log.error("Failed to auto-cover file #{e}")
           end
         end
       when :auto_tag
-        logger.info('Auto Tag')
+        UnitF::Log.info('Auto Tag')
         o.auto_tag!
       when :artist
-        logger.info("Setting artist to #{opt[:artist]}")
+        UnitF::Log.info("Setting artist to #{opt[:artist]}")
         o.tag.artist = opt[:artist]
       when :album
-        logger.info("Setting album to #{opt[:album]}")
+        UnitF::Log.info("Setting album to #{opt[:album]}")
         o.tag.album = opt[:album]
       when :title
-        logger.info("Setting title to #{opt[:title]}")
+        UnitF::Log.info("Setting title to #{opt[:title]}")
         o.tag.title = opt[:title]
       when :genre
-        logger.info("Setting genre to #{opt[:genre]}")
+        UnitF::Log.info("Setting genre to #{opt[:genre]}")
         o.tag.genre = opt[:genre]
       when :track
-        logger.info("Setting track to #{opt[:track]}")
+        UnitF::Log.info("Setting track to #{opt[:track]}")
         o.tag.genre = opt[:track]
+      when :year
+        UnitF::Log.info("Setting year to #{opt[:year]}")
+        o.tag.year = opt[:year]
       end
     end
-    o.save || logger.error("Unable to save changes to #{file}")
+    o.save || UnitF::Log.error("Unable to save changes to #{file}")
   end
 end

data/lib/unitf/tag/file.rb

@@ -11,6 +11,20 @@ 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
@@ -77,7 +91,40 @@ module UnitF
         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
+
+      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
+        tags[:title].gsub!(/\.\w+$/, '')
+        tags[:title].gsub!(/^\d*\s*(-|\.)*\s*/, '')
+        path_parts = realpath.dirname.to_path.split('/')
+        tags[:album] = path_parts[-1]
+        tags[:artist] = path_parts[-2]
+
+        tags.merge(manual_auto_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

data/lib/unitf/tag/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unitf-tag
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Matt Baron
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-05 00:00:00.000000000 Z
+date: 2022-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: taglib-ruby
@@ -67,8 +67,6 @@ files:
 - lib/unitf/tag/flac.rb
 - lib/unitf/tag/mp3.rb
 - lib/unitf/tag/version.rb
-- tag
-- test.rb
 - unitf-tag.gemspec
 homepage: https://github.com/mattbaron/unitf-tag
 licenses:
@@ -93,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Audio File Tagging

data/tag

@@ -1,2 +0,0 @@
-#!/usr/local/bin/ruby
-

data/test.rb

@@ -1,20 +0,0 @@
-require 'find'
-
-require 'unitf/tagger'
-
-file_str = '../../tag/music/If\'n/01-Sometimes.mp3'
-file_str = '/Users/mbaron/tmp/foo-bar.txt'
-
-# begin
-#   file = File.new(file_str)
-# rescue Errno::ENOENT => e
-#   puts "No such file #{file_str}"
-# end
-
-#puts Dir.glob('/Users/mbaron/google-cloud-sdk/**/*')
-
-Find.find('../../tag/music') do |path|
-  next unless File.file?(path)
-  file = UnitF::Tagger::AudioFile.new(path)
-  puts file.cover_path
-end