bandcamp 0.0.4 → 0.0.5

data/lib/band_camp/cli/options.rb

@@ -10,13 +10,13 @@ module BandCamp
         OptionParser.new do |opts|
           opts.banner = "Usage: example.rb [options]"
 
-          opts.on("-t", "--true", "Do not download any mp3 files") do |v|
-            options[:try] = v
-          end
-
           opts.on("-d", "--[no-]debug", "Output debug information") do |v|
             options[:debug] = v
           end
+
+          opts.on("-a", "--all", "If the url does not contain songs but links to tracks/albums: download all those") do |v|
+            options[:all] = v
+          end
         end.parse!
         options
       end

data/lib/band_camp/page.rb

@@ -13,11 +13,15 @@ module BandCamp
     def page_html
       unless @page_html
         puts "Getting content of \"#{@url}\"" if @options[:debug]
-        @page_html = Net::HTTP.get(URI.parse(@url))
+        @page_html = Net::HTTP.get(parsed_url)
       end
       @page_html
     end
 
+    def parsed_url
+      @parsed_url ||= URI.parse(@url)
+    end
+
     def harmony_page
       unless @harmony_page
         # Assigning to a variable first to make the puts statements make sense
@@ -28,6 +32,13 @@ module BandCamp
       @harmony_page
     end
 
+    def is_album?
+      harmony_page.execute_js("TralbumData.current")
+      return true
+    rescue Johnson::Error
+      return false
+    end
+
     def songs
       @songs ||= harmony_page.execute_js("TralbumData.trackinfo").map do |song_object|
         Song.new(song_object.title.to_s, song_object.title_link.to_s, song_object.file.to_s, @options)
@@ -42,7 +53,38 @@ module BandCamp
       @album_name ||= harmony_page.execute_js("TralbumData.current.title")
     end
 
+    def urls_of_albums_on_this_page
+      hpricot.search(".ipCell h1 a").map { |a| extend_relative_url(a.attributes["href"]) }
+    end
+
     def download
+      if is_album?
+        download_songs_for_this_album
+      else
+        download_albums_on_this_page
+      end
+    end
+
+    def extend_relative_url(relative_url)
+      url = URI.parse(relative_url)
+      url.scheme = "http"
+      url.host = parsed_url.host
+      url.to_s
+    end
+
+    def path_for_download
+      File.join("download",
+                BandCamp::file_safe_string(band_name),
+                BandCamp::file_safe_string(album_name))
+    end
+
+    def hpricot
+      @hpricot ||= Hpricot.parse(page_html)
+    end
+
+    private
+
+    def download_songs_for_this_album
       dir = path_for_download
       unless @options[:try]
         `mkdir -p #{dir}`
@@ -61,18 +103,20 @@ module BandCamp
       download_album_art
     end
 
-    def path_for_download
-      File.join("download",
-                BandCamp::file_safe_string(band_name),
-                BandCamp::file_safe_string(album_name))
-    end
-
-    def hpricot
-      @hpricot ||= Hpricot.parse(page_html)
+    def download_albums_on_this_page
+      if @options[:all]
+        puts "Downloading all albums" if @options[:debug]
+        urls_of_albums_on_this_page.sort.each do |album_url|
+          puts "Now downloading: #{album_url}" if @options[:debug]
+          Page.new(album_url, @options).download
+        end
+      else
+        puts "This url does not contain songs, but only a list of albums/tracks:"
+        urls_of_albums_on_this_page.sort.each { |u| puts "- #{u}" }
+        puts "You can either download those urls individually or pass the -a flag to download them all"
+      end
     end
 
-    private
-
     def download_album_art
       # Assumes the directory where the album is downloaded already exists
       url = hpricot.search("#tralbumArt img").first.attributes["src"]

data/lib/band_camp/version.rb

@@ -1,4 +1,4 @@
 module BandCamp
   # We're doing this because bundler did it this way
-  VERSION = "0.0.4" unless defined?(::BandCamp::VERSION)
+  VERSION = "0.0.5" unless defined?(::BandCamp::VERSION)
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bandcamp
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Tom ten Thij
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 +01:00
+date: 2010-09-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency