ayadn 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f4900ba881aee8b2b3ce277facfb6e86f7972b7
-  data.tar.gz: 4a52cad511fce5df653f55b54f4684d9e85071d8
+  metadata.gz: c27895d681609f9415e70476330ed879ab1e9593
+  data.tar.gz: bbf4d6af209533db1571875e09a879a275f27547
 SHA512:
-  metadata.gz: 782007aa8e67ef39f173ac53ddd3d65c5ab2b3bca03b5b7dc9978da8a3ced9fa09f1865ae4bd20a15e0c553379a58c91cb3fc79dd1abb9bc24af4eb7bea3e795
-  data.tar.gz: 397da912926f39f5ebfeb238ee2e3b920eabf8706b0bb86353a88e3c3dd15e6173d073654a2943fd5ca63b3036111e7b42417cf4323dfa19be9e9b43e6554350
+  metadata.gz: 5148331842c2bae97ebc53a6294f9395a970640c9900729ba4b6f68cd7cbb28683dcbec22477556cf924645e2418d3f407461ce16890c44318e24a4cafadeb95
+  data.tar.gz: 829b10f92d7e55c02fdf8c125b212c635ed75a7b8846df2fdb1b0cc1cf570e75020ea0e77259aab8cbefda8e483b149b00577c212c6bcf956e424607c4edf3a2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.5.1 - 'Holograms'
+
+- Improved accuracy of iTunes Store requests for NowPlaying
+
 # 1.5.0 - 'Nozomi'
 
 - In 'convo', both the post id you've requested and the post it replies to are marked with arrows

data/lib/ayadn/action.rb

@@ -969,19 +969,22 @@ module Ayadn
     def itunes_istore_request itunes
       infos = itunes_reg([itunes.artist, itunes.track, itunes.album])
       itunes_url = "https://itunes.apple.com/search?term=#{infos[0]}&term=#{infos[1]}&term=#{infos[2]}&media=music&entity=musicTrack"
-      get_itunes_store(itunes_url)
+      get_itunes_store(itunes_url, itunes.artist, itunes.track)
     end
 
     def lastfm_istore_request artist, track
       infos = itunes_reg([artist, track])
       itunes_url = "https://itunes.apple.com/search?term=#{infos[0]}&term=#{infos[1]}&media=music&entity=musicTrack"
-      get_itunes_store(itunes_url)
+      get_itunes_store(itunes_url, artist, track)
     end
 
-    def get_itunes_store url
+    def get_itunes_store url, artist, track
       results = JSON.load(CNX.download(URI.escape(url)))['results']
       unless results.empty? || results.nil?
-        candidate = results[0]
+
+        resp = results.select {|obj| obj['artistName'] == artist && obj['trackName'] == track}
+        candidate = resp[0] || results[0]
+
         return {
           'code' => 200,
           'artist' => candidate['artistName'],

data/lib/ayadn/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Ayadn
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Eric Dejonckheere