doubapi 0.1.5 → 0.1.6

data/lib/doubapi.rb

@@ -58,7 +58,8 @@ Event =  Struct.new :title, :when, :where, :what,:link,:poster_mobile,:bar_icon
 #release_date is in the format of YY-MM-DD
 Album =  Struct.new :author, :title, :release_date, :link,:cover_thumbnail,:cover_big,:publisher,:mobile_site,:rating,:tracks
 
-Track = Struct.new :title,:url
+Track = Struct.new :title,:play_url
+
 
 
 #input:{key => "all/singer_name", :location => "shanghai", :start_index => 16,:max_result => 15}
@@ -199,34 +200,37 @@ end
 def search_albums_of_v2 h
 
   artist_chinese = h[:singer]
-  max=h[:max_result]||10
+	max=h[:max_result]||10
   keywords= "%" + artist_chinese.each_byte.map {|c| c.to_s(16)}.join("%")
 	url="https://api.douban.com/v2/music/search?q=#{keywords}"
  	#uri="http://api.douban.com/music/subjects?tag=#{keywords}&start-index=1&max-results=#{max}"
 
-	puts "requeset url #{url}"
+	puts "requeset url #{url}  #{artist_chinese}"
 	#issue http request 
   doc = open(url, :proxy => nil, 'User-Agent' => 'ruby')
 
 	#parse result
 	albums = []
-	response = JSON.parse(File.read(doc))
+	response = JSON.parse(doc.read)
+
 	response["musics"].each do |item|
 		#select only whose singer eqls artist_chinese
-		if item["attrs"]["singer"].include?(artist_chinese)
+		has_singer_attr =  !item["attrs"].nil? && !item["attrs"]["singer"].nil? 
+		if has_singer_attr && item["attrs"]["singer"].include?(artist_chinese)
 			m = item["attrs"]
 			author = artist_chinese
-			title = m["title"].first
-			formated_release_day = m["pubdate"].first
+			title = if m['title'].nil? then "unknown" else m["title"].first end
+			formated_release_day = if m['pubdate'].nil? then "unknown" else m["pubdate"].first end
 			link = mobile_site = item['mobile_link']
 			cover_thumnail = cover_big = item['image']
-			publisher = m['publisher'].first
+			publisher = if m['publisher'].nil? then "unknown" else m['publisher'].first end
 			rating = item['rating']['average']
 			tracks=[]
-			m['tracks'].first.split('\n').each_with_index do |t,index|
-				tracks << Doubapi::Track.new(t,nil)
+			if not m['tracks'].nil?
+				m['tracks'].first.split("\n").each_with_index do |t,index|
+					tracks << Doubapi::Track.new(t,nil)
+				end
 			end
-
   		albums << Doubapi::Album.new(author, title, formated_release_day, link, 
 																	 cover_thumnail,cover_big ,publisher,mobile_site,rating,
 																	tracks)

data/lib/doubapi/version.rb

@@ -1,3 +1,3 @@
 module Doubapi
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/test.rb

@@ -19,8 +19,14 @@ end
 
 def test2
   #author = "李志"
-  author = "窦唯"
-  total, albums = Doubapi.search_albums_of(:singer=>author,:since=>"1900-05",:max_result => 20) 
+  #author = "窦唯"
+
+	#authors = File.read("artists.txt").split("\n")
+
+	authors = ['汪峰']
+	authors.each do |author|
+	
+	total, albums = Doubapi.search_albums_of(:singer=>author,:since=>"1900-05",:max_result => 20) 
   
   #release date decending
   albums.sort {|a , b| b.release_date <=> a.release_date }.each do |album|
@@ -38,11 +44,13 @@ def test2
 			puts track.title
 		end
 
-		puts album.json
+		#puts album.json
   end
-  
+ 
+	end# each author
   #rating decending
-  
+ 
+=begin
   #release date decending
    albums.sort {|a , b| b.rating <=> a.rating }.each do |album|
      puts "-------------------------------"
@@ -56,6 +64,7 @@ def test2
      puts album.rating
    end
   puts "total #{total}"
+=end
 end 
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doubapi
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors: