live_set 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 383208bd53c5b54e254945faa8d79ae100b78a1dd34fa3820abdaec8dc1b2854
-  data.tar.gz: b6d6ae70303f7ff3a2c43039a27ca2424c8296dcf6cf36d3ff9a572d4d285b97
+  metadata.gz: dc8a391b89faff33b3611d93ff5223d28d14c9a87359bc98a9005b93908db8d9
+  data.tar.gz: a2aab3005d94ad93eaf5f94bd61af6770b1656ce1addc8d54a83bab20e3faeb3
 SHA512:
-  metadata.gz: 1e2078593ba88bb503c9a2a712bc85362f05b31ceec83a3276785a3b01961d8c85b6c6cc3bf7822670e1e4bb4372dfb214225ab1cbe927f9e6ffab541539560a
-  data.tar.gz: 408994bfca9f20dec4df040cee40268da9339549963ee10da80725f2dc4f619ec01db53d1df4e0c02389aeee6224f8c7ecf1bb21044ce24878a56fb5177a2039
+  metadata.gz: 54672b577455e31011165d8c78e1402ac74754f67d53ae07ca9fff123af8263c06650960fa8ce372511f8c26f6d206a9ab829253d4951a9eb7bfa08cd9c5cb6f
+  data.tar.gz: 24c3db212c86904c2935c6ea4bad27c80e6ed2e2ca535f4e32cd83b9828f96bdadf3bc1a62bb0f6ae9dc2b7c40a85821aa3db5b79bfe18f3dacd4d3ec4f8bbc5

data/CHANGELOG.md

@@ -1,9 +1,19 @@
 # Change Log
 
+## 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
+
+* Corrected missing help method for the `live_set` command.
+* Prompts user if they want the extra directory renamed to `Ableton Project Info-`.
+
+
 ## 0.2.0
 
 * Checks `Ableton Project Info` validity all up the directory tree.
-* Prompts user if they want the extra directory renamed to `Ableton Project Info-`.
 * Reports the clips in the set, and their sizes.
 * Generates a warning if the total size of the clips might cause freezing to fail.
 

data/lib/als_delta/{ als_delta_class.rb → als_delta_class.rb}

@@ -1,5 +1,7 @@
 require 'date'
 require 'fileutils'
+require 'highline'
+require 'shellwords'
 require_relative '../common/run'
 
 class AlsDelta
@@ -26,6 +28,7 @@ class AlsDelta
 
   def backup_set
     @backup_name = backup_name
+    puts "Backing up Live set to '#{@backup_name}'"
     FileUtils.cp @set_name, @backup_name
   end
 
@@ -33,16 +36,25 @@ class AlsDelta
     return if @options[:keep] || !@backup_name
     return unless File.exist? @backup_name
 
-    puts "Deleting #{@backup_name}"
+    puts "Deleting '#{@backup_name}'"
     File.delete @backup_name
   end
 
   def show
-    output = run_capture_stdout "zdiff '#{@backup_name}' '#{@set_name}'"
-    if output.empty?
-      puts 'There were no changes to the saved live set.'
-    else
-      puts output.join("\n")
+    backup_set
+    loop do
+      puts 'Press any key to display the changes to the Live set XML file, or press Esc to exit.'
+      character = $stdin.getch
+      exit if character.ord == 27
+      output = run_capture_stdout "GZIP=--no-name zdiff #{@set_name.shellescape} #{@backup_name.shellescape}"
+      if output.empty?
+        puts 'There were no changes to the saved live set.'
+      else
+        puts output.join("\n")
+        backup_set
+      end
+    rescue StandardError => e
+      puts e
     end
   end
 end

data/lib/als_delta/als_delta_options.rb

@@ -1,7 +1,7 @@
 require 'colorator'
 require 'optparse'
 
-VERBOSITY = %w[trace debug verbose info warning error fatal panic quiet].freeze
+VERBOSITY = %w[trace debug verbose info warning error fatal panic quiet].freeze unless defined? VERBOSITY
 
 def common(command)
   @options = parse_options command

data/lib/live_set/live_set_all_tracks.rb

@@ -16,6 +16,23 @@ 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.relative_path}' has not been collected".red unless clip.relative_path.start_with?('Samples/Imported/')
+      end
+    end
+    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
@@ -27,6 +44,7 @@ class AllTracks
                    end
     total_set_size = "Total set size: #{human_file_size total_size}".yellow
     <<~END_MSG
+      #{p3s_tx_msg}
       #{total_set_size}#{size_warning}#{push_warning}
       #{@track_instances.count} tracks#{all_frozen_msg}:
     END_MSG

data/lib/live_set/live_set_audio_clip.rb

@@ -20,6 +20,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

@@ -19,6 +19,10 @@ class LiveAudioTrack
     @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**' : ''

data/lib/live_set/live_set_class_private.rb

@@ -1,3 +1,6 @@
+require 'colorator'
+require 'highline'
+
 class LiveSet
   private
 
@@ -9,12 +12,18 @@ class LiveSet
 
     cur_dir = Pathname.new(set_directory).parent
     while cur_dir
-      if File.exist? File.join(cur_dir, 'Ableton Project Info')
-        puts "Warning: 'Ableton Project Info' exists in parent directory '#{cur_dir.to_path}'".red
-      end
+      project_info_path = File.join(cur_dir, 'Ableton Project Info')
+      add_dash_suffix(project_info_path) if File.exist? project_info_path
       break if cur_dir.to_path == '/'
 
       cur_dir = cur_dir.parent
     end
   end
+
+  def add_dash_suffix(cur_dir, path)
+    puts "Warning: 'Ableton Project Info' exists in parent directory '#{cur_dir.to_path}'".red
+    return unless HighLine.agree("\nDo you want the directory to be disabled by suffixing a dash to its name? ", character = true)
+
+    File.rename path, "#{path}-"
+  end
 end

data/lib/live_set/live_set_options.rb

@@ -1,14 +1,14 @@
 require 'colorator'
 require 'optparse'
 
-VERBOSITY = %w[trace debug verbose info warning error fatal panic quiet].freeze
+VERBOSITY = %w[trace debug verbose info warning error fatal panic quiet].freeze unless defined? VERBOSITY
 
-def live_set(msg = nil)
+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.0'.freeze unless defined? VERSION
+  VERSION = '0.2.2'.freeze unless defined? VERSION
 end

data/lib/live_set.rb

@@ -22,7 +22,6 @@ def als_delta
 
   als_delta = AlsDelta.new set_name, **@options
   catch :ctrl_c do
-    als_delta.backup_set
     als_delta.show
     als_delta.cleanup
   rescue Exception # rubocop:disable Lint/RescueException

data/live_set.gemspec

@@ -33,5 +33,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'bytesize'
   spec.add_dependency 'colorator'
+  spec.add_dependency 'highline'
   spec.add_dependency 'nokogiri'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: live_set
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Mike Slinn
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-20 00:00:00.000000000 Z
+date: 2024-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bytesize
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -71,7 +85,7 @@ files:
 - als_notes.md
 - exe/als_delta
 - exe/live_set
-- lib/als_delta/ als_delta_class.rb
+- lib/als_delta/als_delta_class.rb
 - lib/als_delta/als_delta_options.rb
 - lib/common/common.rb
 - lib/common/run.rb