jxl-muq 0.0.1 → 0.0.2

data/bin/muq

@@ -105,8 +105,15 @@ Main do
         total = get.size
         count = 1
         get.each do |song|
-          puts "[#{count}/#{total}] #{song[:name]}"
-          m.download(song[:url], "#{@dir}/#{user}/#{song[:file]}")
+          puts "[#{count}/#{total}] #{song[:artist]} - #{song[:title]}"
+          file = "#{@dir}/#{user}/#{song[:file]}"
+          m.download(song[:url], file)
+          m.retag(file, 
+            { :artist => song[:artist],
+              :title => song[:title],
+              :album => user,
+              :track=> count }
+          )
           count += 1
         end
       end

data/lib/muq.rb

@@ -92,18 +92,22 @@ class Muq
   def songs(user)
     doc = Hpricot(get("#{user}.#{@host}"))
     scripts = doc.search("//script[@type='text/javascript']").inner_text
-    kettle = scripts.match(/new Kettle\((.*)\)/)[1]
-    split = kettle.scan(/\[.+?\]/)
-    hex = eval("Array.new(#{split[0]})")
-    sig = eval("Array.new(#{split[1]})")
+    kettle = scripts.match(/new Kettle\(\[(.+?)\],\[(.+?)\]\)/)
+    hex, sig = [kettle[1], kettle[2]].map do |a|
+      a.gsub("'",'').split(",")
+    end
     out = []
     if hex.size == sig.size
       total = hex.size
       total.times do |i|
-        name = doc.search("//li[@id='song#{hex[i]}']/div[@class='name']").inner_text.strip
+        track = doc.search("//li[@id='song#{hex[i]}']/div[@class='name']").inner_text.strip
+        if track =~ /(.+)\s-\s(.+)/
+          artist, title = [$1, $2]
+        end
         url = "http://muxtape.s3.amazonaws.com/songs/"
         url += "#{hex[i]}?PLEASE=DO_NOT_STEAL_MUSIC&#{sig[i]}" # rly sry lulz
-        out << {:name => name, :file => filename(name, i+1), :url => url}
+        out << { :artist => artist, :title => title,
+                 :file => filename("#{artist} - #{title}", i+1), :url => url }
       end
     end
     out
@@ -171,6 +175,17 @@ class Muq
     "#{rnd_string(6, true, "a", "f")}"
   end
 
+  def retag(file, tags)
+    tag = ID3Lib::Tag.new(file)
+    tag.delete_if {true}
+    tag.artist = tags[:artist] if tags[:artist]
+    tag.title  = tags[:title]  if tags[:title]
+    tag.album  = tags[:album]  if tags[:album]
+    tag.track  = tags[:track]  if tags[:track]
+    #tag.part_of_set = tags[:total] if tags[:total]
+    tag.update!(ID3Lib::V_ALL)
+  end
+
   private
     # http get
     def get(url)
@@ -242,12 +257,9 @@ class Muq
     # funky filename
     def filename(name, nr)
       file = name.downcase
-      file = file.gsub(" - ", "-")
-      file = file.gsub("/", "")
-      file = file.gsub(".", "")
-      file = file.gsub(",", "")
-      file = file.gsub("  ", " ")
       file = file.gsub(" ", "_")
+      file = file.gsub("_-_", "-")
+      file = file.gsub(/[^a-zA-Z0-9\-\(\)\[\]_]/, "")
       file = "#{"%02.0f" % nr}-#{file}-muq.mp3"
     end
 

data/muq.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "muq"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
   s.summary = "Muxtape.com CLI"
   s.description = "Command line interface for Muxtape."
   s.author = "Ron Damen"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jxl-muq
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Ron Damen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-26 00:00:00 -07:00
+date: 2008-04-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency