deadlist 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edb67e52d7cf77e3a3f693fa49c5939be32fb714b247b67a5e7dfd4dc64d4b34
-  data.tar.gz: f9bfc50fd08fd7586f5c542e0c540e8c5ffafee8480af8e9b8dfc1d1d6be3c02
+  metadata.gz: a7a8fcc71296e7c196d233a170985d82a143da192420557a869ec6924bc165bc
+  data.tar.gz: 1bffff8c94561151b48ec9adabcdb418e7df13971b810f7deb61d5f4ceda678b
 SHA512:
-  metadata.gz: 76d8d658f14a546206b157a8765f48e1283f718e5c13864c0f7a605884f64e23235342f4767677b07a27e878cfc4cb00e96951fb5e85055efbcaafb69e3ea0dc
-  data.tar.gz: 48d2e2aead1b040a6034bfb946c7cb62048490c22796dfc9dfbcd4451822305758dd243c1ee3ad107c998697a16ce2155f29766f8aa5582354ba80948235d6f3
+  metadata.gz: 142ff3d85a10c2ead5b00a14692dbbd0736c3f9b0c8b7ff0ec5a1c92b278bd11038459ae2fc0f175b85035f7222fa8f7a705541315a60bda213beccc1e6247c8
+  data.tar.gz: 6c86fae1e34b504a2385e241ec97b54c1944db52caa4025d6d03f982c8d2199c1c07ec500277d0966a5b0c2d30a3383f844dc995d84087f7149dbd324b3f0d85

data/lib/deadlist/cli/argument_parser.rb

@@ -7,8 +7,8 @@ class ArgumentParser
       opts.separator ""
       opts.separator "Required options:"
       
-      opts.on("-i", "--id ID", "ID of show to download") do |id|
-        params[:id] = id
+      opts.on("-i", "--id ID", "ID of show(s) to download (comma-separated for multiple)") do |id|
+        params[:ids] = id.split(',').map(&:strip)
       end
       
       opts.on("-f", "--format FORMAT", "Format to download (mp3, flac, ogg)") do |format|
@@ -18,6 +18,10 @@ class ArgumentParser
       opts.separator ""
       opts.separator "Other options:"
       
+      opts.on("-d", "--directory PATH", "Directory to save show(s) to. Will default to /shows/ in the execution directory") do |dir|
+        params[:directory] = dir
+      end
+
       opts.on("-h", "--help", "Show this help") do
         puts opts
         exit
@@ -27,6 +31,14 @@ class ArgumentParser
         puts "deadlist v#{version}"
         exit
       end
+
+      opts.on('-q', '--quiet', 'Run silently') do
+        params[:quiet] = true
+      end
+
+      opts.on('--dry-run', 'List tracks to be downloaded') do
+        params[:dry_run] = true
+      end
     end
     
     parser.parse!(args)
@@ -41,12 +53,20 @@ class ArgumentParser
   private
 
   def self.validate_required_params!(params, parser)
-    missing = []
-    missing << "--id" unless params[:id]
-    missing << "--format" unless params[:format]
-    
-    unless missing.empty?
-      puts "Error: Missing required arguments: #{missing.join(', ')}"
+    has_ids = params[:ids]&.any?
+    has_format = params[:format]
+
+    # If one is provided, both must be provided
+    if !has_ids && !has_format
+      puts "Error: Arguments are required for DeadList, try --help for more info"
+      puts parser
+      exit(1)
+    elsif has_ids && !has_format
+      puts "Error: --format is required when --id is provided"
+      puts parser
+      exit(1)
+    elsif has_format && !has_ids
+      puts "Error: --id is required when --format is provided"
       puts parser
       exit(1)
     end

data/lib/deadlist/cli/client.rb

@@ -1,7 +1,7 @@
 # The Client class manages HTML scraping and parsing for the CLI and other classes above it. Any HTML work should be handled here.
 class Client
     def query_show_info(show_id)
-        url = 'https://archive.org/metadata/' + show_id
+        url = "https://archive.org/metadata/#{show_id}"
         response = HTTParty.get(url)
 
         unless response.success?
@@ -22,7 +22,7 @@ class Client
             files: response["files"]
         }
 
-        return show_data
+        show_data
     rescue HTTParty::Error, StandardError => e
         raise "Failed to fetch show data: #{e.message}"
     end

data/lib/deadlist/cli/downloader.rb

@@ -3,7 +3,8 @@
 class Downloader
     BASE_API_URL = 'https://archive.org'
 
-    def initialize(path, format)
+    def initialize(path, format, logger: Logger.new($stdout))
+        @logger = logger
         @path = path
         @format = format
     end
@@ -16,10 +17,25 @@ class Downloader
     def get(root_url, track_object)
         uri = URI.parse(root_url + track_object.filename); raise ArgumentError, "Only HTTP(S) URLs allowed" unless uri.is_a?(URI::HTTP)
         download = uri.open
-        filename = "#{@path}/#{track_object.pos} -- #{track_object.title}.#{@format}"
 
-        IO.copy_stream(download, filename)
+        # Extract disc number from filename
+        disc_match = track_object.filename.match(/(?<!g)d(\d+)/)
+        sanitized_title = track_object.title.gsub('/', '-')
+
+        if disc_match
+            # Multi-disc: use disc-track format (1-01, 2-01, etc.)
+            disc_num = disc_match[1]
+            padded_track = track_object.pos.rjust(2, '0')
+            filename = "#{@path}/#{disc_num}-#{padded_track} -- #{sanitized_title}.#{@format}"
+        else
+            # Single disc: regular format
+            filename = "#{@path}/#{track_object.pos} -- #{sanitized_title}.#{@format}"
+        end
+
+            IO.copy_stream(download, filename)
+        true
     rescue => e
-        puts "❌ Download failed: #{e.message}"
+        @logger.error "❌ Download failed for '#{track_object.title}': #{e.message}"
+        false
     end
 end

data/lib/deadlist/cli.rb

@@ -2,16 +2,22 @@ require_relative 'cli/client'
 require_relative 'cli/downloader'
 require_relative 'models/show'
 require_relative 'models/track'
-require_relative 'cli/argument_parser.rb'
+require_relative 'cli/argument_parser'
 require 'fileutils'
 require 'optparse'
 
 # The CLI is the 'session' created by the main class, managing arguments passed in and housing methods for scraping and downloading shows.
 class CLI
-    def initialize(version, args)
+    attr_reader :args, :show
+
+    def initialize(version, args, logger: Logger.new($stdout))
         @version = version
         @args = {}
         @show = nil
+        @logger = logger
+        @logger.formatter = proc do |severity, datetime, progname, msg|
+          "#{msg}\n"
+        end
 
         startup_text
         parse_arguments(args)
@@ -19,34 +25,37 @@ class CLI
 
     # Creates new show object with link given populated with metadata and track details
     def create_show
-        extracted_id = extract_show_id(@args[:id])
-        @show = Show.new(extracted_id, @args[:format])
+        show_id = @args[:ids].first
+        extracted_id = extract_show_id(show_id)
+        @show = Show.new(extracted_id, @args[:format], logger: @logger)
 
-        puts "\n💿 #{@show.name} - #{@show.tracks.length} tracks found!"
+        @logger.info "💿 #{@show.name} - #{@show.tracks.length} tracks found!"
     rescue => e
-        puts "\n❌ Scraping failed: #{e.message}"
+        @logger.error "❌ Scraping failed: #{e.message}"
     end
 
-    # Validates format isn't for test, and passes directory + format arguments to the download method of a Show
+    # Downloads show tracks or displays dry-run preview
     def download_show
-        if @args[:format] == "test"
-          puts "Test Download, skipping"   
+        if @args[:dry_run]
+            @logger.info "🔍 Dry Run: #{@show.name} will be downloaded with #{@show.tracks.count} tracks"
+            @show.tracks.each do |track|
+                @logger.info "  #{track.pos} - #{track.title}"
+            end
         else
-            download_directory = setup_directories(@show)
+            download_directory = setup_directories(@show, @args[:directory])
             @show.download_tracks(download_directory)
         end
     rescue => e
-        puts "\n❌ Download failed: #{e.message}"
+        @logger.error "❌ Download failed: #{e.message}"
     end
 
     private
 
     # Deadlist starts with some friendly text
     def startup_text
-        puts "\n\n"
-        puts '='*52
-        puts "🌹⚡️ One man gathers what another man spills... ⚡️🌹"
-        puts '='*52
+        @logger.info '='*52
+        @logger.info "🌹⚡️ One man gathers what another man spills... ⚡️🌹"
+        @logger.info '='*52
     end
 
     # Reads arguments passed at the command line and maps them to an instance object
@@ -63,17 +72,22 @@ class CLI
     end
 
     # Configures directories that will be used by the downloader
-    def setup_directories(show, base_path = Dir.pwd)
-        # Create base shows directory
-        shows_dir = File.join(base_path, "shows")
-        FileUtils.mkdir_p(shows_dir)
-        
-        # Create specific show directory
-        show_dir = File.join(shows_dir, show.name)
+    def setup_directories(show, custom_path = nil)
+        if custom_path
+            # Custom path: use it directly
+            base_dir = custom_path
+        else
+            # Default: add shows subdirectory
+            base_dir = File.join(Dir.pwd, "shows")
+        end
+
+        FileUtils.mkdir_p(base_dir)
+
+        show_dir = File.join(base_dir, show.name)
         FileUtils.mkdir_p(show_dir)
 
-        return show_dir
+        show_dir
     rescue => e
-        puts "\n❌ Directory creation failed: #{e.message}"
+        @logger.error "❌ Directory creation failed: #{e.message}"
     end
-end
+end

data/lib/deadlist/models/show.rb

@@ -1,8 +1,11 @@
 # Object to handle Show data and the array of Track objects to be used in downloading.
 class Show
+    AUDIO_FORMATS = %w[mp3 flac ogg m4a].freeze
+
     attr_reader :name, :venue, :date, :location, :duration, :transferred_by, :tracks, :available_formats
 
-    def initialize(show_id, format)
+    def initialize(show_id, format, logger: Logger.new($stdout))
+        @logger = logger
         @show_id = show_id
         @format = format
         @name = nil
@@ -19,14 +22,21 @@ class Show
 
     # Initializes a Downloader and passes track details
     def download_tracks(path)
-        dl = Downloader.new(path, @format)
+        dl = Downloader.new(path, @format, logger: @logger)
         download_url = dl.download_url_for_show(@show_id)
+        succesful_downloads = 0
 
         @tracks.each do |track|
-            dl.get(download_url, track)
+            @logger.info "⬇️ Downloading #{track.pos} - #{track.title}..."
+
+            if dl.get(download_url, track)
+                succesful_downloads += 1
+            end
 
-            puts "⚡️ #{track.pos} - #{track.title} downloaded successfully"
+            @logger.info "⚡️ #{track.pos} - #{track.title} downloaded successfully"
         end
+
+        @logger.info "✅ Downloaded #{succesful_downloads}/#{@tracks.length} tracks successfully!"
     end
 
     private
@@ -42,9 +52,9 @@ class Show
         @transferred_by = show_data[:transferred_by]
         @name = "#{show_data[:date]} - #{show_data[:venue]} - #{show_data[:location]}"
         @tracks = set_tracks(show_data[:files])
-        @url = "https://archive.org/metadata/" + show_data[:dir] + "/"
+        @url = "https://archive.org/metadata/#{show_data[:dir]}/"
 
-        puts "🌹💀 Downloading #{name}"
+        @logger.info "🌹💀 Show #{name} found!"
     end
     
     # Converts track lists to Track objects
@@ -53,20 +63,18 @@ class Show
                             .select { |file| matches_format?(file, @format) }
                             
         if audio_files.empty?
-            puts "❌ No #{@format} files found"
+            @logger.error "❌ No #{@format} files found"
             return []
         end
   
-        @tracks = audio_files.map { |track| Track.new(track) }
+        @tracks = audio_files.map.with_index(1) { |track, index| Track.new(track, index) }
     end
 
-    private
-
     def audio_file?(file)
-        %w[mp3 flac ogg m4a].include?(File.extname(file["name"]).delete('.'))
+        AUDIO_FORMATS.include?(File.extname(file["name"]).delete('.').downcase)
     end
 
     def matches_format?(file, format)
-        File.extname(file["name"]).delete('.') == format
+        File.extname(file["name"]).delete('.').downcase == format
     end
 end

data/lib/deadlist/models/track.rb

@@ -1,8 +1,8 @@
 class Track
   attr_reader :pos, :title, :filename
 
-  def initialize(track_data)
-    @pos = track_data["track"]
+  def initialize(track_data, index)
+    @pos = track_data["track"] || index
     @title = track_data["title"]
     @filename = track_data["name"]
   end

data/lib/deadlist/version.rb

@@ -0,0 +1,3 @@
+class DeadList
+  VERSION = '1.2.0'
+end

data/lib/deadlist.rb

@@ -1,34 +1,63 @@
 require 'httparty'
-require 'nokogiri'
 require 'open-uri'
 require 'pry'
+require 'logger'
 
-require_relative 'deadlist/cli.rb'
+require_relative 'deadlist/version'
+require_relative 'deadlist/cli'
 
 # Main DeadList class.
 class DeadList
-    def initialize
-        @current_version = '1.1.0'
+    attr_reader :current_version
+
+    def initialize(logger: Logger.new($stdout))
+      @logger = logger
+      @logger.level = Logger::INFO  # Default level
+      @logger.formatter = proc do |severity, datetime, progname, msg|
+          "#{msg}\n"
+      end
+      @current_version = VERSION
     end
 
-    # Argument abstraction should probably happen at this level!
+    def run(argv = ARGV)
+      # Parse arguments to get show IDs and options
+      parsed_args = ArgumentParser.parse(argv, @current_version)
+      show_ids = parsed_args[:ids]
+
+      # Check for --quiet flag and adjust logger level
+      if parsed_args[:quiet]
+          @logger.level = Logger::ERROR
+      end
+
+      # Process each show
+      show_ids.each_with_index do |show_id, index|
+        @logger.info "📻 Processing show #{index + 1}/#{show_ids.count}: #{show_id}"
+
+        # Build arguments for this specific show
+        show_argv = ['--id', show_id, '--format', parsed_args[:format]]
+        show_argv += ['--directory', parsed_args[:directory]] if parsed_args[:directory]
+        show_argv += ['--quiet'] if parsed_args[:quiet]
+        show_argv += ['--dry-run'] if parsed_args[:dry_run]
 
-    def run        
-        # Start a new CLI session
-        # In future this could be abstracted to pass the show link vs all args, so a 'session' is started per show.
-        session = CLI.new(@current_version, ARGV)
+        # Create CLI session for this show
+        session = CLI.new(@current_version, show_argv, logger: @logger)
 
         # Scrape links and metadata for given show
         session.create_show
 
-        # In future, consider starting multiple downloaders for a list of shows
-        # show_list = session.args[:shows]
-        # show_list.each do |show|
-        #   session.download_show(show)
-        # end
+        # Check if show has tracks in requested format
+        if session.show && session.show.tracks.empty?
+          @logger.error "❌ #{show_id} not available in #{parsed_args[:format]} format"
+          if session.show.available_formats && !session.show.available_formats.empty?
+            @logger.error "   Available formats: #{session.show.available_formats.join(', ')}"
+          end
+          @logger.error "   Skipping..."
+          next  # Skip to next show
+        end
 
-        # Create folder with show date and begin track downloads if format matches
+        # Create folder and begin track downloads
         session.download_show
+      end
     end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deadlist
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - nazwr
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-18 00:00:00.000000000 Z
+date: 2025-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
 description: A Ruby gem for downloading Grateful Dead concert recordings from the
   Internet Archive
 email: nathan@azotiwright.com
@@ -54,6 +40,7 @@ files:
 - lib/deadlist/cli/downloader.rb
 - lib/deadlist/models/show.rb
 - lib/deadlist/models/track.rb
+- lib/deadlist/version.rb
 homepage: https://github.com/nazwr/deadlist
 licenses:
 - MIT