From owner-svn-ports-head@FreeBSD.ORG Sat Sep 14 20:48:48 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id DDCE0E69; Sat, 14 Sep 2013 20:48:48 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AF7B82A86; Sat, 14 Sep 2013 20:48:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8EKmmho067469; Sat, 14 Sep 2013 20:48:48 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8EKmmIF067455; Sat, 14 Sep 2013 20:48:48 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201309142048.r8EKmmIF067455@svn.freebsd.org> From: Rene Ladan Date: Sat, 14 Sep 2013 20:48:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327317 - in head/multimedia/spotify-websocket-api: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Sep 2013 20:48:48 -0000 Author: rene Date: Sat Sep 14 20:48:48 2013 New Revision: 327317 URL: http://svnweb.freebsd.org/changeset/ports/327317 Log: - Properly fix the "album" and "artist" commands - 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 Sat Sep 14 20:45:42 2013 (r327316) +++ head/multimedia/spotify-websocket-api/Makefile Sat Sep 14 20:48:48 2013 (r327317) @@ -3,7 +3,7 @@ PORTNAME= SpotifyWebsocketAPI PORTVERSION= 0.2 -PORTREVISION= 3 +PORTREVISION= 4 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 Sat Sep 14 20:45:42 2013 (r327316) +++ head/multimedia/spotify-websocket-api/files/patch-clients__respotify__respotify.py Sat Sep 14 20:48:48 2013 (r327317) @@ -1,5 +1,5 @@ --- ./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 ++++ ./clients/respotify/respotify.py 2013-09-14 22:32:17.000000000 +0200 @@ -88,8 +88,10 @@ print "Playlists\n" index = 1 @@ -13,7 +13,7 @@ else: try: if len(rootlist) >= int(args[0][0]): -@@ -115,7 +117,10 @@ +@@ -115,10 +117,14 @@ def command_album(*args): @@ -21,11 +21,16 @@ + if len(*args) == 0 or args[0][0] == "" or current_playlist is None: + return + -+ if type(args[0][0]) != int: ++ try: ++ index = int(args[0][0])-1 ++ except: return - index = int(args[0][0])-1 -@@ -127,7 +132,10 @@ +- index = int(args[0][0])-1 + if current_playlist.getNumTracks() < index: + return + +@@ -127,10 +133,14 @@ def command_artist(*args): @@ -33,11 +38,16 @@ + if len(*args) == 0 or args[0][0] == "" or current_playlist is None: + return + -+ if type(args[0][0]) != int: ++ try: ++ index = int(args[0][0])-1 ++ except: + return + +- index = int(args[0][0])-1 + if current_playlist.getNumTracks() < index: return - index = int(args[0][0])-1 -@@ -278,7 +286,7 @@ +@@ -278,7 +288,7 @@ if spotify.logged_in(): os.system("kill `pgrep -f respotify-helper` &> /dev/null") uri_resolver = subprocess.Popen([sys.executable, "respotify-helper.py",