got_mp3 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44c046df30aa09ee8f417c5151a511c16a55758cb324b64c9b8bb376f68b14ac
-  data.tar.gz: d6b18ee2753e965126a74218816625f48c36bdb09ca3b0b91b822236934f4158
+  metadata.gz: c34d1db35e8baadaaf24b2fa70f3598a64ec38ddd47095188a82eae76e063573
+  data.tar.gz: 86bb8da65ce447a7bbd168b068cc9b992b551b0db201eac8a3e2949fdc1d5dba
 SHA512:
-  metadata.gz: 3b8136cf7e4e913de207514afbe0c24295e95a18131c64aa49c57a5ce8c554cb9411ac638626c840aa3a0653f01391fd7e43f5d1aabafc0c090521a7dd58cffa
-  data.tar.gz: db25f65976be5cccda5a2ef7a56a194ae08577c56e916fdcd368de15cc8a5b70e563e6e5792ce7179a4f70a0df1fdc5074e6bb334636257b9f6590500c15aa79
+  metadata.gz: 5c666482d88a53d4e608316cbbbe83dd8b7b2c1fed9d725f666fdbf0c32c4e20ff809e5a2a51f72f87cf63659dc94f3f1bf5420b823bbebb0638b7e95781bcfe
+  data.tar.gz: f6508835a0db94da8febc2d301ed40ab8b490caf17caf74af73c46418e0ffddb80142a3c24f8a82ca157a355bec0fa792cb6b813af9ae8dcf3c66ac350c702d4

data/lib/got_mp3.rb

@@ -2,6 +2,7 @@
 
 # file: got_mp3.rb
 
+require 'dxlite'
 require 'ostruct'
 require "mp3info"
 
@@ -77,13 +78,11 @@ class GotMP3
 
     find_by_ext('.mp3').each do |directory, _ |
 
-      puts 'write_titles() - directory: ' + directory.inspect if @debug
       txt_filename = Dir[File.join(directory, '*.txt')].first
 
       next unless txt_filename
 
       target_file = File.basename(directory)
-
       FileUtils.cp txt_filename, File.join(target_directory,
                                            target_file + '.txt')
 
@@ -149,7 +148,7 @@ class GotMP3
 
   end
 
-  def write_titles()
+  def write_titles(format: 'txt')
 
     puts 'inside write_titles()' if @debug
 
@@ -158,41 +157,64 @@ class GotMP3
       puts 'write_titles() - directory: ' + directory.inspect if @debug
       txt_filename = Dir[File.join(directory, '*.txt')].first
 
-      next if txt_filename
+      next if txt_filename and format.to_sym == :txt
 
       tracks = []
 
       each_mp3_track(directory) do |mp3, trackno, mp3_filepath|
 
         tracks << OpenStruct.new({
-          title: mp3.tag.title,
+          title: mp3.tag.title.sub(/^\d+\. */,''),
           artist: mp3.tag.artist,
           album: mp3.tag.album,
-          album_artist: mp3.tag2['TPE2'],
-          disc: mp3.tag2['TPOS'],
+          album_artist: mp3.tag2['TPE2'] || mp3.tag.artist,
+          disc: mp3.tag2['TPOS'] || 1,
           tracknum: mp3.tag.tracknum,
           filename: File.basename(mp3_filepath)
         })
 
       end
 
+      puts 'tracks: ' + tracks.inspect if @debug
+
       heading = tracks[0].album_artist + ' - ' + tracks[0].album
+
       s = "# %s\n\n" % [heading]
       h = tracks.group_by(&:disc)
 
-      body = if h.length == 1 then
 
-        list(tracks)
+      if format.to_sym == :txt then
+
+        body = if h.length == 1 then
+
+          list(tracks)
+
+        else
+
+          "\n" + h.map do |disc, tracks2|
+            ("## Disc %d\n\n" % disc) + list(tracks2) + "\n\n"
+          end.join("\n")
+
+        end
+
+        File.write File.join(directory, heading + '.txt'), s + body
 
       else
 
-        "\n" + h.map do |disc, tracks2|
-          ("## Disc %d\n\n" % disc) + list(tracks2) + "\n\n"
-        end.join("\n")
+        # :xml
+        puts 'xml' if @debug
 
-      end
+        dx = DxLite.new('album[album_artist, album]/track(tracknum, title, ' +
+                                                 'artist, disc, album_artist)')
 
-      File.write File.join(directory, heading + '.txt'), s + body
+        h.each {|_,x| puts x.inspect } if @debug
+        h.each {|_,x| x.each {|track| dx.create(track.to_h) } }
+
+        dx.album_artist = dx.all[0].album_artist
+        dx.album = dx.all[0].album
+        dx.save File.join(directory, 'playlist.dx')
+
+      end
 
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: got_mp3
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,8 +35,28 @@ cert_chain:
   RFrZsrDO1Cwk4v03qCUvuZ8H/nCojYYJGMrJE1JhBBJNJXCAULivh/zlOYcDhG69
   uPtZOD7YKrG45OftX8aNxlNv
   -----END CERTIFICATE-----
-date: 2021-11-26 00:00:00.000000000 Z
+date: 2021-11-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: dxlite
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: ruby-mp3info
   requirement: !ruby/object:Gem::Requirement