svn commit: r326933 - in head/multimedia/spotify-websocket-api: . files

[Rene Ladan]

Author: rene
Date: Tue Sep 10 21:07:38 2013
New Revision: 326933
URL: http://svnweb.freebsd.org/changeset/ports/326933

Log:
  Do not crash on a non-numeric argument to the 'album' or 'artist' command.
  
  Bump PORTREVISION

Modified:
  head/multimedia/spotify-websocket-api/Makefile
  head/multimedia/spotify-websocket-api/files/patch-clients__respotify__respotify.py

Modified: head/multimedia/spotify-websocket-api/Makefile
==============================================================================
--- head/multimedia/spotify-websocket-api/Makefile	Tue Sep 10 20:45:04 2013	(r326932)
+++ head/multimedia/spotify-websocket-api/Makefile	Tue Sep 10 21:07:38 2013	(r326933)
@@ -3,7 +3,7 @@
 
 PORTNAME=	SpotifyWebsocketAPI
 PORTVERSION=	0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 

Modified: head/multimedia/spotify-websocket-api/files/patch-clients__respotify__respotify.py
==============================================================================
--- head/multimedia/spotify-websocket-api/files/patch-clients__respotify__respotify.py	Tue Sep 10 20:45:04 2013	(r326932)
+++ head/multimedia/spotify-websocket-api/files/patch-clients__respotify__respotify.py	Tue Sep 10 21:07:38 2013	(r326933)
@@ -1,5 +1,5 @@
---- ./clients/respotify/respotify.py.orig	2013-09-10 22:10:39.000000000 +0200
-+++ ./clients/respotify/respotify.py	2013-09-10 22:11:58.000000000 +0200
+--- ./clients/respotify/respotify.py.orig	2013-08-08 08:45:21.000000000 +0200
++++ ./clients/respotify/respotify.py	2013-09-10 23:04:36.000000000 +0200
 @@ -88,8 +88,10 @@
          print "Playlists\n"
          index = 1
@@ -13,25 +13,31 @@
      else:
          try:
              if len(rootlist) >= int(args[0][0]):
-@@ -115,7 +117,7 @@
+@@ -115,7 +117,10 @@
  
  
  def command_album(*args):
 -    if args[0][0] == "" or current_playlist is None:
 +    if len(*args) == 0 or args[0][0] == "" or current_playlist is None:
++        return
++
++    if type(args[0][0]) != int:
          return
  
      index = int(args[0][0])-1
-@@ -127,7 +129,7 @@
+@@ -127,7 +132,10 @@
  
  
  def command_artist(*args):
 -    if args[0][0] == "" or current_playlist is None:
 +    if len(*args) == 0 or args[0][0] == "" or current_playlist is None:
++        return
++
++    if type(args[0][0]) != int:
          return
  
      index = int(args[0][0])-1
-@@ -278,7 +280,7 @@
+@@ -278,7 +286,7 @@
      if spotify.logged_in():
          os.system("kill `pgrep -f respotify-helper` &> /dev/null")
          uri_resolver = subprocess.Popen([sys.executable, "respotify-helper.py",