live_set 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc8a391b89faff33b3611d93ff5223d28d14c9a87359bc98a9005b93908db8d9
-  data.tar.gz: a2aab3005d94ad93eaf5f94bd61af6770b1656ce1addc8d54a83bab20e3faeb3
+  metadata.gz: 32e6a9b1a71d9857578af4ffc6cc644eaf476cf719af3be8c8983f2c51dd1f3a
+  data.tar.gz: b4c43b90e98dfb6917d998bf274a603275e6c90a1601977597d5d65d7e3aa77c
 SHA512:
-  metadata.gz: 54672b577455e31011165d8c78e1402ac74754f67d53ae07ca9fff123af8263c06650960fa8ce372511f8c26f6d206a9ab829253d4951a9eb7bfa08cd9c5cb6f
-  data.tar.gz: 24c3db212c86904c2935c6ea4bad27c80e6ed2e2ca535f4e32cd83b9828f96bdadf3bc1a62bb0f6ae9dc2b7c40a85821aa3db5b79bfe18f3dacd4d3ec4f8bbc5
+  metadata.gz: b400c0bedce4e5d903abe7b32d50abf4087ba1ab7cbf077a5bd559c9fda2a9a9ebf322710cbe211223413e8d79b83cd0fdf583526f5d514094d88d97a94cb7b6
+  data.tar.gz: '0891c4261574ef1d988070eba9f8bdd8cd29fc6eb5a3733a41a8afa714e2f46dd0da61a8a06d58cde5d81a8ea96ea76dfea83ccc2c1b9fb923ebfa974a5dfd86'

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # 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,

data/lib/live_set/live_set_all_tracks.rb

@@ -24,18 +24,20 @@ class AllTracks
     return 'Ready for transfer to Push 3 Standalone'.green if ready_for_p3s
 
     response = []
-    response << 'Some tracks are not frozen'.red unless all_frozen
+    response << ' - Some tracks are not frozen.'.red unless all_frozen
     @track_instances.each do |track|
       track.audio_clips.each do |clip|
-        response << "Clip '#{clip.relative_path}' has not been collected".red unless clip.relative_path.start_with?('Samples/Imported/')
+        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
@@ -45,7 +47,7 @@ class AllTracks
     total_set_size = "Total set size: #{human_file_size total_size}".yellow
     <<~END_MSG
       #{p3s_tx_msg}
-      #{total_set_size}#{size_warning}#{push_warning}
+      #{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)

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,7 +13,8 @@ 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
@@ -25,8 +26,9 @@ class LiveAudioTrack
 
   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/version.rb

@@ -1,3 +1,3 @@
 module LiveSetVersion
-  VERSION = '0.2.2'.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.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Mike Slinn