ayadn 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b19a3dc1aa12adf7b39f48f5d49556057c486b9
-  data.tar.gz: 80c36b97acf3d121c3eb47a155cf151ebb330567
+  metadata.gz: 8b5f20d344841d76ea6958dcb51032bfed8992ec
+  data.tar.gz: 5ab42f2b2eb18f2713ed4b8ce191d5a833f3da96
 SHA512:
-  metadata.gz: 85f82405d3fa6d68e3fc7596b7744c02cd4006217ed75229c7ead7eb2705ec8d75b572854f4dbd97e148ffaf4aa946f086f0ef96647ca696fd499cc99dd79a1c
-  data.tar.gz: 7f79f25d7bd8425eae96214416c0b5e414a454e41d262c84bb5a0d337f5779c1cc8e908dd71d4fc6f75b6b3d292578730364ea0edf745828fe5ff112e8cfa73f
+  metadata.gz: ad72ea71606ddee934d7d6c1a6ac9508bfe2f0c88a893a7a86462fa43409081626270d0241d302b393d679e0fef3a43ec7d6365e7f4379655dd9ea2874f5bbe5
+  data.tar.gz: dfd9d769dcd06f22ba4a68309308aa7a9133d2d2d6882485fc99c7f5b5ae873595ea4ee1a528aef0ce943435d4685a225b123ce5c89b5505c920bda6f6cfac13

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.0.4 - 2014-11-30 - 'The Penguin'
+
+- Fix: nowplaying iTunes Store requests
+- Fix: unread messages displayed from oldest to newest
+
 ## 2.0.3 - 2014-11-18 - 'Dexter'
 
 - Fix: title of a pinned post

data/lib/ayadn/action.rb

@@ -569,7 +569,7 @@ module Ayadn
           exit
         end
         unread_messages = {}
-        unread_channels.each do |id|
+        unread_channels.reverse.each do |id|
           @thor.say_status :downloading, "messages from channel #{id}"
           since = Databases.find_last_id_from("channel:#{id}")
           unless since.nil?

data/lib/ayadn/nowplaying.rb

@@ -179,40 +179,9 @@ module Ayadn
 
     def get_itunes_store url, artist, track
       results = JSON.load(CNX.download(URI.escape(url)))['results']
-      # puts results.inspect
-      unless results.empty? || results.nil?
-        # results.each {|obj| puts obj['trackName']}
-        # puts "-"
-        # puts track
-        one = results.select do |obj|
-          next if obj['trackName'].nil?
-          obj['trackName'].downcase == track.downcase
-        end
-        # puts one.inspect
-        if one.empty?
-          by_artist = results.select do |obj|
-            next if obj['artistName'].nil?
-            obj['artistName'].downcase == artist.downcase
-          end
-          # puts by_artist
-          by_exact_track = by_artist.select do |obj|
-            next if obj['trackName'].nil?
-            obj['trackName'].downcase == track.downcase
-          end
-          # puts by_exact_track
-          if by_exact_track.empty?
-            splitted = track.split(" ").first.downcase
-            results = by_artist.select do |obj|
-              next if obj['trackName'].nil?
-              obj['trackName'].split(" ").first.downcase == splitted
-            end
-          else
-            results = by_exact_track
-          end
 
-        else
-          results = one
-        end
+      # puts results.inspect
+      unless results.nil?
 
         if results.empty?
           return {
@@ -221,7 +190,19 @@ module Ayadn
           }
         end
 
-        candidate = results[0]
+        candidates = []
+        candidates_track = results.map { |e| e if e['trackName'].downcase == track.downcase }.compact
+        candidates_track.each do |e|
+          next if e['artistName'].nil?
+          candidates << e if e['artistName'].downcase == artist.downcase
+        end
+        # require "pp";pp candidates; exit
+
+        candidate = if candidates.empty?
+          results[0]
+        else
+          candidates[0]
+        end
 
         return {
           'code' => 200,

data/lib/ayadn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-22 00:00:00.000000000 Z
+date: 2014-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor