unitf-tag 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3844f8f9883d9584a03a19be4ca9200c7b2203ec5b0f6d7615477d097d430628
-  data.tar.gz: 55e82e675756dbb52721575c888b0e3b7fb1bb2f0a59c9eb8b6557c657c54f2a
+  metadata.gz: 68404fe4f09503662b8fa2f52479ce65d14f5c9eea0d6928e99a10599c468be8
+  data.tar.gz: 398a8ea66bcfa0dcc33d3fafb1e51f6fcd305c4377644df6a3d5ad94f3786647
 SHA512:
-  metadata.gz: eb091d040bab764dda18aded5e23a7ed370f0b3b253a8b4b21b324b22a85b6ac079e6ce8fd530665f84fd9a0b30e454a846f7af64305b1bc601e988266bb4b31
-  data.tar.gz: 90448d8bf47f1973c1639c6fc81f18b258ed24e248f314f37a6d79a119e2e09420b14bede4c2276d6030bfeb7e7ec5f64929d9e51ee24c59ef662e9cccb315d2
+  metadata.gz: 94f7d7c34b182095ea849846ebbb811e2f964d50d74aff54a8e9648193b366ada30028216440f53a96ce3b7133a4d40e9cdf2ee565479df5b07a15958b174a0b
+  data.tar.gz: 0475211c72702358a985acece10e4af18ac3f36c2d3869807f329a03391d80b16e64968d2aa852b4c55a70776c3ec149aec091fd7336cf77ae076858617fe04c

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+Gemfile.lock
 
 # 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'
-
-file = UnitF::Tag::FLAC.new(file_str)
+UnitF::Log.to_console
 
+file = UnitF::Tag::File.new('/Users/mbaron/tmp/WFMU/BJ/bj211119.mp3')
 file.open do |o|
-  pp o.info
+  puts o.auto_tags
 end

data/exe/{rtag → tag}

@@ -5,15 +5,13 @@ $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 = []
-opt = {
-  recursive: false,
-  force: false
-}
+opt = {}
 
 targets = OptionParser.new do |opts|
   opts.on('-r', '--recursive', 'Auto Cover') do
@@ -67,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
@@ -76,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?
@@ -85,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

@@ -77,7 +77,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.6"
+    VERSION = "0.1.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unitf-tag
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Matt Baron
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-04 00:00:00.000000000 Z
+date: 2022-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: taglib-ruby
@@ -42,7 +42,7 @@ description: Audio File Tagging
 email:
 - mwb@unitf.net
 executables:
-- rtag
+- tag
 extensions: []
 extra_rdoc_files: []
 files:
@@ -59,7 +59,7 @@ files:
 - bin/console
 - bin/setup
 - bin/test.rb
-- exe/rtag
+- exe/tag
 - lib/unitf/tag.rb
 - lib/unitf/tag/export/exporter.rb
 - lib/unitf/tag/file.rb
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Audio File Tagging