spotilocal 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3042a37f2e758e8437cd73fe3142cc73c4f7d00
-  data.tar.gz: dcf7e8c8ce8028983f1ed68049a92d2e13e70cf8
+  metadata.gz: 9024ff189cda39e9cdfedc960f2af360a4b72fad
+  data.tar.gz: 36d400bc168d54a9a19a78a02dbe857641ab92aa
 SHA512:
-  metadata.gz: 3fb84933e51b2078608940eaafab81c1a62dd2b6b8ca677be4fe0676036a7e54dde60f98da1d959cc13cbb7a87a0a50ff94a9972bb22efcbd97082cb61a4a4cc
-  data.tar.gz: 3589900b3eb8353aaf621380db9c43a9e525ab8d4fe10f8e2926554cd057d519401f132d26ba60e1abaf4d704147adb815c1f1d8b7f4bc11c13b79bcc23f3c35
+  metadata.gz: a8d6cdcff47c4a5504375e8d7630377976be69b20d8f952182be6cff52754e6a595ec6cc59522b6c4ca80ac981b768dfddcec7e52ab94d639c52b2aa08df0d4b
+  data.tar.gz: 79e63aa8f02c8919378df1a394e17032d918f79e45e2aba455d58e4ecbe03a009f65e150a4b8260aa95d0c5fd66b96f0fdc6c345d2c354fd2300ffd149c78449

data/README.md

@@ -21,15 +21,17 @@ Or install it yourself as:
 
 ## Usage
 
-Currently you have to enter the port manually. Autodiscover is planned.
+You can specify a port to create the instance faster. Otherwise spotilocal will try to discover the port.
 ```ruby
 # Create a new spotify object
-s = Spotilocal::Local.new port: 4382
+s = Spotilocal::Client.new port: 4382
 ```
 
 After that you can simply fetch some informations.
 ```ruby
 s.status
+s.pause   # true if paused
+s.unpause # true if playing
 ```
 
 ## Development

data/lib/spotilocal.rb

@@ -1,5 +1,6 @@
 require 'typhoeus'
 require 'json'
+require 'ostruct'
 
 require 'spotilocal/version'
 require 'spotilocal/client'

data/lib/spotilocal/client.rb

@@ -4,7 +4,7 @@ module Spotilocal
 
     HEADERS = { Origin: 'https://open.spotify.com' }.freeze
 
-    def initialize(port: nil)
+    def initialize(port: discover_port)
       raise 'Port required' unless port
       @url = "http://localhost:#{port}"
       @csrf = csrf_token
@@ -12,17 +12,15 @@ module Spotilocal
     end
 
     def status
-      req = Typhoeus.get("#{url}/remote/status.json",
-                         params: { csrf: csrf, oauth: oauth })
-      puts JSON.parse(req.response_body)
+      lcall(:status)
     end
 
     def pause
-      !lcall(:pause, params: { pause: 'true' })['playing']
+      !lcall(:pause, params: { pause: 'true' }).playing
     end
 
     def unpause
-      lcall(:pause, params: { pause: 'false' })['playing']
+      lcall(:pause, params: { pause: 'false' }).playing
     end
 
     private
@@ -30,7 +28,7 @@ module Spotilocal
     def lcall(loc, params: {}, resource: :remote)
       req = Typhoeus.get("#{url}/#{resource}/#{loc}.json",
                          params: params.merge(csrf: csrf, oauth: oauth))
-      JSON.parse(req.response_body)
+      JSON.parse(req.response_body, object_class: OpenStruct)
     end
 
     def oauth_token
@@ -42,5 +40,14 @@ module Spotilocal
       req = Typhoeus.get("#{url}/simplecsrf/token.json", headers: HEADERS)
       JSON.parse(req.response_body)['token']
     end
+
+    def discover_port
+      (4370..4390).each do |port|
+        if Typhoeus.get("http://localhost:#{port}",
+                        timeout: 1).return_code == :ok
+          return port
+        end
+      end
+    end
   end
 end

data/lib/spotilocal/version.rb

@@ -1,3 +1,3 @@
 module Spotilocal
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/spotilocal.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'Remote control your spotify client'
   spec.description   = 'Wrapper to remote control a local spotify client'
-  spec.homepage      = 'https://brauser.io'
+  spec.homepage      = 'https://github.com/Flipez/spotilocal'
   spec.license       = 'MIT'
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spotilocal
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Flipez
@@ -101,7 +101,7 @@ files:
 - lib/spotilocal/client.rb
 - lib/spotilocal/version.rb
 - spotilocal.gemspec
-homepage: https://brauser.io
+homepage: https://github.com/Flipez/spotilocal
 licenses:
 - MIT
 metadata: {}