batch_audio_convert 0.2.0-x86_64-linux → 0.2.1-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dba537a7f79cf45e492d05cef05cfef1b1a5704
-  data.tar.gz: 17d8a4ee0afb80b149781b4d0cb93a2a78850bcd
+  metadata.gz: 77b87c437ae6410f25e5943663a914079c34706c
+  data.tar.gz: 585e6d1358755f4e7e6344f8167cd6c8eaed4a8a
 SHA512:
-  metadata.gz: 5390d080495b13fc0289abcbbe879dd84fb4c04035243e15787895cfbc6508657b6f04f627fdcb19f20fa920fb5c545d7d4589b37df42830d3d6196103726a39
-  data.tar.gz: 9c2219ca34ffa4ecd236676442d2cfee0bdd0c5e7eefcd7f806f3439a8d96df2cadd38122555706d8fc283d4ee2906ec1206d475d9bb307e67d0dddc38563883
+  metadata.gz: 0aec9988efd9079db5a2593633b24e7ddcf06d1908378e57650e971882c18db598ffdff42c7a46a29bb171fce949ad87cfd63c9cacf1c614e7c440a93dfa746c
+  data.tar.gz: 7dcbe4aa7c5f6661c0452a12f9d5e6cd8c360a78b4633649ea9408e692eddfd736245ef09bfd5ecf7f3a73e2979aa4f43c04aec644e1ddb836a6e8e743ea6588

data/batch_audio_convert.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'pry'
 
   spec.add_runtime_dependency 'easy_app_helper', '~> 3.0'
   spec.add_runtime_dependency 'taglib-ruby'
-  spec.add_runtime_dependency 'pry'
 
 end

data/bin/batch_audio_convert

@@ -9,7 +9,6 @@
 
 require 'easy_app_helper'
 require 'batch_audio_convert'
-require 'pry'
 
 
 class BatchAudioConvertApp
@@ -20,7 +19,7 @@ class BatchAudioConvertApp
   APP_NAME = 'batch_audio_convert'
 
   def initialize
-    # Providing this data is optional but brings better logging and online help
+    # Providing this data is optional but brings better logging and online help
     config.describes_application(app_name: APP_NAME, app_version: VERSION, app_description: DESCRIPTION)
     add_cmd_line_options
   end

data/lib/batch_audio_convert/audio_utils.rb

@@ -10,12 +10,22 @@ require 'taglib'
 
 module AudioUtils
 
-  TAGS = [:title, :artist, :comment, :genre, :album, :track, :year]
-
   OGG_ENC_CMD = 'oggenc -q##OGGQUALITY## -o "##OGGFILE##" "##WAVFILE##"'
   FLAC_DEC_CMD = 'flac -d -f -o "##WAVFILE##" "##FLACFILE##"'
   MP3_ENC_CMD = 'lame -h -b ##MP3QUALITY## "##WAVFILE##" "##MP3FILE##"'
 
+  # From ID3V2 Reference https://web.archive.org/web/20161117211455/http://id3.org/d3v2.3.0
+  MP3_TAGS = {
+    'ALBUM' => 'TALB',
+    'ARTIST' => 'TPE1',
+    'ALBUMARTIST' => 'TPE2',
+    'TITLE' => 'TIT2',
+    'COPYRIGHT' => 'TCOP',
+    'DATE' => 'TDRC',
+    'TRACKNUMBER' => 'TRCK'
+  }.freeze
+
+
   def flac_to_ogg (origin, destination)
     flac_to origin, destination do |temp_file, tags|
       run_command build_ogg_cmd(temp_file.path, destination)
@@ -58,25 +68,21 @@ module AudioUtils
 
   def flac_tags(file)
     puts_and_logs ' - Reading FLAC tags'
-    tags = {}
-    TagLib::FileRef.open(file) do |file_ref|
-      tag = file_ref.tag
-      TAGS.each do |tag_name|
-        tags[tag_name] = tag.send(tag_name)
-      end
+    TagLib::FLAC::File.open(file) do |file_handle|
+      tag = file_handle.xiph_comment
+      logger.debug tag.field_list_map.inspect
+      tag.field_list_map
     end
-    logger.debug tags.inspect
-    tags
   end
 
   def set_ogg_tags(file, tags)
     puts_and_logs ' - Writing OGG tags'
-    TagLib::FileRef.open(file) do |file_ref|
-      tag = file_ref.tag
+    TagLib::Ogg::Vorbis::File.open(file) do |file_handle|
+      tag = file_handle.tag
       tags.each do |tag_name, value|
-        tag.send("#{tag_name.to_s}=", tags[tag_name])
+        tag.add_field tag_name, value.first
       end
-      file_ref.save
+      file_handle.save
     end
   end
 
@@ -96,13 +102,28 @@ module AudioUtils
   def set_mp3_tags(file, tags)
     puts_and_logs ' - Writing MP3 tags'
     TagLib::MPEG::File.open(file) do |file_ref|
-      tag = file_ref.id3v2_tag(true)
+      tag = file_ref.id3v2_tag
       tags.each do |tag_name, value|
-        tag.send("#{tag_name.to_s}=", tags[tag_name])
+        # tag.send("#{tag_name}=", value.first)
+        unless MP3_TAGS.keys.include? tag_name
+          logger.warn "Ignoring tag '#{tag_name}' ! Not handled !"
+          next
+        end
+
+        logger.debug "Processing original tag '#{tag_name}' as '#{MP3_TAGS[tag_name]}' ID3V2 tag..."
+        frame = TagLib::ID3v2::TextIdentificationFrame.new(MP3_TAGS[tag_name], TagLib::String::UTF8)
+        val = if tag_name == 'TRACKNUMBER'
+                       tags['TRACKTOTAL'] ? "#{value.first}/#{tags['TRACKTOTAL'].first}" : value.first
+                     else
+                       value.first
+                     end
+        logger.debug " - #{MP3_TAGS[tag_name]} => #{val}"
+        frame.text = val
+        tag.add_frame frame
       end
       file_ref.save
     end
-  end  
+  end
 
   def build_mp3_cmd(origin, destination)
     config[:'mp3-quality'] ||= 256

data/lib/batch_audio_convert/version.rb

@@ -6,5 +6,5 @@
 ################################################################################
 
 module BatchAudioConvert
-  VERSION = '0.2.0'
-end
+  VERSION = '0.2.1'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batch_audio_convert
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: x86_64-linux
 authors:
 - L.Briais
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-10 00:00:00.000000000 Z
+date: 2023-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,35 +39,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: easy_app_helper
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: taglib-ruby
+  name: easy_app_helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: taglib-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: Converts FLAC audio files to OGG or MP3 format while keeping tags and tree