live_set 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9caef58c0bed30ead696f9d64848c74038aa520d83a2c47796cb0081c0ad6b14
-  data.tar.gz: 85906715baa37c0ed5a2fd4f0a101e37d5c5728a4385f0754d120514b18d7b89
+  metadata.gz: 32e6a9b1a71d9857578af4ffc6cc644eaf476cf719af3be8c8983f2c51dd1f3a
+  data.tar.gz: b4c43b90e98dfb6917d998bf274a603275e6c90a1601977597d5d65d7e3aa77c
 SHA512:
-  metadata.gz: 88404bf0b8d04663da0d7a334a8affd9d930df965af1b3fed1b3a2b9286881380ecba7882badbf71d0612674a3f77775a436a6e5a505a4bb9b25801522ad5ab6
-  data.tar.gz: d633040d514b77e4984e936c4676fd5f124ee30da405b6c612f916edbd33625cbacb0a1d35812aaae393f03436cab2054144e54a75db1214ba64196c92511cf4
+  metadata.gz: b400c0bedce4e5d903abe7b32d50abf4087ba1ab7cbf077a5bd559c9fda2a9a9ebf322710cbe211223413e8d79b83cd0fdf583526f5d514094d88d97a94cb7b6
+  data.tar.gz: '0891c4261574ef1d988070eba9f8bdd8cd29fc6eb5a3733a41a8afa714e2f46dd0da61a8a06d58cde5d81a8ea96ea76dfea83ccc2c1b9fb923ebfa974a5dfd86'

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 0.2.3
+
+* Improved warning messages.
+
+
+## 0.2.2
+
+* Displays `Ready for transfer to Push 3 Standalone` in green if Live set is ready,
+  or displays the reasons for not being ready in red.
 
 ## 0.2.1
 

data/lib/live_set/live_set_all_tracks.rb

@@ -16,9 +16,28 @@ class AllTracks
     end
   end
 
+  def ready_for_p3s
+    @track_instances.all?(&:clips_collected?) && all_frozen
+  end
+
+  def p3s_tx_msg
+    return 'Ready for transfer to Push 3 Standalone'.green if ready_for_p3s
+
+    response = []
+    response << ' - Some tracks are not frozen.'.red unless all_frozen
+    @track_instances.each do |track|
+      track.audio_clips.each do |clip|
+        response << " - Clip '#{clip.absolute_path}' has not been collected.".red unless clip.relative_path.start_with?('Samples/Imported/')
+      end
+    end
+    response.reverse!
+    response << 'Warning: This set should not be transferred to Push 3 Standalone.'.red
+    response.reverse!
+    response.join "\n"
+  end
+
   def summary
     all_frozen_msg = all_frozen ? ' (All are frozen)'.yellow : ''
-    push_warning = all_frozen ? '' : "\nWarning: some tracks are not frozen, so this set should not be transferred to Push 3 Standalone.".red
     total_size = @track_instances.sum(&:track_size)
     size_warning = if total_size >= 2_000_000_000
                      "\nWarning: This set is too large to be frozen and too large too large to transfer to Push 3 Standalone.".red
@@ -27,7 +46,8 @@ class AllTracks
                    end
     total_set_size = "Total set size: #{human_file_size total_size}".yellow
     <<~END_MSG
-      #{total_set_size}#{size_warning}#{push_warning}
+      #{p3s_tx_msg}
+      #{total_set_size}#{size_warning}
       #{@track_instances.count} tracks#{all_frozen_msg}:
     END_MSG
   end

data/lib/live_set/live_set_audio_clip.rb

@@ -1,7 +1,8 @@
 require 'date'
 
 class LiveAudioClip
-  attr_reader :file_size
+  attr_reader :absolute_path, :file_ref, :file_size, :file_type, :id, :last_modified, :live_pack_name, :need_refreeze, :relative_path,
+              :relative_path_type
 
   # @param audio_clip is an inner <ClipSlot/> element from an Ableton Live .als file as parsed by Nokogiri
   def initialize(id, need_refreeze, clip_slot)
@@ -20,6 +21,10 @@ class LiveAudioClip
     @relative_path_type = @file_ref.RelativePathType['Value'] # What do these values mean?
   end
 
+  def collected?
+    @relative_path.start_with? 'Samples/Imported/'
+  end
+
   def show_clip
     ["    #{@relative_path}", human_file_size(@file_size).rjust(8, ' '), @last_modified.strftime('%Y-%m-%d %H:%M:%S')]
   end

data/lib/live_set/live_set_audio_track.rb

@@ -1,5 +1,5 @@
 class LiveAudioTrack
-  attr_reader :frozen, :track_size
+  attr_reader :audio_clips, :clip_slots, :frozen, :id, :track_size
 
   # @param audio_track is an <AudioTrack/> element from an Ableton Live .als file as parsed by Nokogiri
   def initialize(audio_track)
@@ -13,16 +13,22 @@ class LiveAudioTrack
       clip_slot_id = clip_slot['Id']
       need_refreeze = clip_slot.NeedRefreeze['Value'].to_bool
       inner_clip_slot = clip_slot.ClipSlot
-      LiveAudioClip.new clip_slot_id, need_refreeze, inner_clip_slot if inner_clip_slot.respond_to?(:Value) && !inner_clip_slot.Value.children.empty?
+      LiveAudioClip.new clip_slot_id, need_refreeze, inner_clip_slot if
+        inner_clip_slot.respond_to?(:Value) && !inner_clip_slot.Value.children.empty?
     end
     @audio_clips.compact!
     @track_size = @audio_clips.sum(&:file_size) || 0
   end
 
+  def clips_collected?
+    @audio_clips.all?(&:collected?)
+  end
+
   def show_track(all_frozen)
     name = @audio_track.Name.EffectiveName['Value']
-    frozen = !all_frozen && @audio_track.frozen? ? ' **frozen**' : ''
-    "Track '#{name}'#{frozen} (#{@audio_clips.length} clips, totaling #{human_file_size @track_size})\n" + show_clips
+    frozen = @audio_track.frozen? ? ' frozen'.green : ' **not frozen**'.red unless all_frozen || @audio_clips.empty?
+    size = ", totaling #{human_file_size @track_size}" unless @audio_clips.empty?
+    "Track '#{name}'#{frozen} (#{@audio_clips.length} clips#{size})\n" + show_clips
   end
 
   def show_clips

data/lib/live_set/live_set_options.rb

@@ -6,9 +6,9 @@ VERBOSITY = %w[trace debug verbose info warning error fatal panic quiet].freeze
 def help_live_set(msg = nil)
   printf "Error: #{msg}\n\n".yellow unless msg.nil?
   msg = <<~END_HELP
-    Live_sete displays information about an Ableton Live set or converts a Live 12 set to Live 11 format.
+    Live_set displays information about an Ableton Live set or converts a Live 12 set to Live 11 format.
     If the special folder called 'Ableton Project Info' is not present in the same folder as the .als file, a warning is generated.
-    Similarly, if 'Ableton Project Info' is present in any parent folder, a warning is issued.
+    Similarly, if 'Ableton Project Info' is present in any parent folder, a warning is issued and the user is asked if the directory should be renamed.
 
     Syntax: live_set OPTIONS PATH_TO_ALS_FILE
 

data/lib/live_set/version.rb

@@ -1,3 +1,3 @@
 module LiveSetVersion
-  VERSION = '0.2.1'.freeze unless defined? VERSION
+  VERSION = '0.2.3'.freeze unless defined? VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: live_set
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Mike Slinn