diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1404ea4..91355ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
# Changelog #
+## v0.13 ##
+- Added: preliminary scaffolding for web API (playlists, starring, all of it is coming)
+- Added: new settings menu.
+- Added: you can now *disable* track notifications
+- Fixed: track notifications say the right thing in Spotify 1.0
+
## v0.12 ##
- Added: compatiblity with Alfred Remote
diff --git a/README.md b/README.md
index c4c6b59..52a17c0 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Spotifious uses Packal to make sure you always have the latest version. It gives
## Download & Install ##
-Latest version: [v0.11.2](https://github.com/citelao/Spotify-for-Alfred/archive/master.zip) | Latest dev build: [v0.11.2](https://github.com/citelao/Spotify-for-Alfred/archive/dev.zip)
+Latest version: [v0.13](https://github.com/citelao/Spotify-for-Alfred/archive/master.zip) | Latest dev build: [v0.13](https://github.com/citelao/Spotify-for-Alfred/archive/dev.zip)
1. [Download](https://github.com/citelao/Spotify-for-Alfred/archive/master.zip)
this repository.
@@ -90,6 +90,7 @@ A lot of people helped out on this:
- **vdesabou** and I trade ideas a ton
- **PHPfunk** and his PHP Alfred workflow inspired much of `OhAlfred`
- **David Ferguson** helped with some iffy Alfred glitches
+- **jwilsson**'s [Spotify PHP web API](http://jwilsson.github.io/spotify-web-api-php/).
- a slightly modified version of [Entypo](http://www.entypo.com/) icon font face for icons.
- and many other people mentioned in the code.
@@ -106,6 +107,7 @@ Oh, and thanks for reading this whole README. I hope you enjoy Spotifious!
See `CHANGELOG.md` for more detailed information.
+- v0.13: Preliminary Web API; toggle track notifications
- v0.12: Compatible with Alfred Remote
- v0.11.2: Location opt-out and tutorial
- v0.11.1: Fixed response freezing
diff --git a/Spotifious.alfredworkflow b/Spotifious.alfredworkflow
deleted file mode 100644
index 61a9ee7..0000000
Binary files a/Spotifious.alfredworkflow and /dev/null differ
diff --git a/callback.php b/callback.php
new file mode 100644
index 0000000..f79d66c
--- /dev/null
+++ b/callback.php
@@ -0,0 +1,40 @@
+options('spotify_client_id'), $alfred->options('spotify_secret'), 'http://localhost:11114/callback.php');
+
+// Request a access token using the code from Spotify
+$session->requestToken($_GET['code']);
+
+// Save the tokens
+$alfred->options("spotify_access_token", $session->getAccessToken());
+$alfred->options("spotify_refresh_token", $session->getRefreshToken());
+$alfred->options("spotify_access_token_expires", time() + $session->getExpires());
+
+?>
+
+
+ Spotifious Setup
+
+
+
+
+
+
+
+
+
Spotifious should be setup :)
+
+ You should be able to start using Spotifious now!
+
+
+
(enjoy)
+
+
+
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 5a0d8a4..ce9f558 100644
--- a/composer.json
+++ b/composer.json
@@ -4,5 +4,8 @@
"OhAlfred\\": "src/citelao/OhAlfred/",
"Spotifious\\": "src/citelao/Spotifious/"
}
+ },
+ "require": {
+ "jwilsson/spotify-web-api-php": "0.6.*"
}
}
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 0000000..af3408c
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,62 @@
+{
+ "_readme": [
+ "This file locks the dependencies of your project to a known state",
+ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+ "This file is @generated automatically"
+ ],
+ "hash": "45586bdb80f81335b8366a45bdf833f6",
+ "packages": [
+ {
+ "name": "jwilsson/spotify-web-api-php",
+ "version": "0.6.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/jwilsson/spotify-web-api-php.git",
+ "reference": "0d9ea746aa942d215301fe463611ef1a3d4b9b93"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/jwilsson/spotify-web-api-php/zipball/0d9ea746aa942d215301fe463611ef1a3d4b9b93",
+ "reference": "0d9ea746aa942d215301fe463611ef1a3d4b9b93",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "4.*",
+ "satooshi/php-coveralls": "dev-master",
+ "vlucas/phpdotenv": "1.*"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "SpotifyWebAPI\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jonathan Wilsson",
+ "email": "jonathan.wilsson@gmail.com"
+ }
+ ],
+ "description": "PHP implementation of Spotify's Web API.",
+ "homepage": "https://github.com/jwilsson/spotify-web-api-php",
+ "keywords": [
+ "spotify"
+ ],
+ "time": "2014-10-26 16:23:57"
+ }
+ ],
+ "packages-dev": [],
+ "aliases": [],
+ "minimum-stability": "stable",
+ "stability-flags": [],
+ "prefer-stable": false,
+ "platform": [],
+ "platform-dev": []
+}
diff --git a/include/images/dash.png b/include/images/dash.png
new file mode 100644
index 0000000..ced246d
Binary files /dev/null and b/include/images/dash.png differ
diff --git a/include/images/disabled.png b/include/images/disabled.png
new file mode 100644
index 0000000..52cf6d8
Binary files /dev/null and b/include/images/disabled.png differ
diff --git a/include/images/psd/dash.psd b/include/images/psd/dash.psd
new file mode 100644
index 0000000..97cf0ad
Binary files /dev/null and b/include/images/psd/dash.psd differ
diff --git a/include/images/psd/disabled.psd b/include/images/psd/disabled.psd
new file mode 100644
index 0000000..e72116e
Binary files /dev/null and b/include/images/psd/disabled.psd differ
diff --git a/include/setup/client_submit.php b/include/setup/client_submit.php
new file mode 100644
index 0000000..4335964
--- /dev/null
+++ b/include/setup/client_submit.php
@@ -0,0 +1,87 @@
+
+
+
+ Spotifious Setup
+
+
+
+
+
+
+
+
+
Setup complete!
+
You've successfully opted out of using a Spotify app.
+
+ You can always opt back in using the settings menu in
+ Spotifious. Just type s in Spotifious.
+
+
You can now reopen Spotifious to continue setup.
+
+
+
+
+
+ requestCredentialsToken($scopes);
+} catch(SpotifyWebAPI\SpotifyWebAPIException $e) {
+ $response["status"] = "error";
+
+ $response["message"] = "Invalid data - ";
+ if ($e->getMessage() == "Invalid client") {
+ $response["message"] .= "invalid ID";
+ } elseif($e->getMessage() == "Invalid client secret") {
+ $response["message"] .= "incorrect secret";
+ } else {
+ $response["message"] .= $e->getMessage();
+ }
+
+ echo json_encode($response);
+ exit();
+}
+
+// Save data
+$alfred->options('spotify_client_id', $_GET["id"]);
+$alfred->options('spotify_secret', $_GET["secret"]);
+$alfred->options('spotify_access_token', '');
+$alfred->options('spotify_access_token_expires', '');
+$alfred->options('spotify_refresh_token', '');
+
+$response["status"] = "success";
+$response["message"] = "Saved your information! Make sure to do step 8 :)";
+echo json_encode($response);
+exit();
\ No newline at end of file
diff --git a/include/setup/img/client_info.png b/include/setup/img/client_info.png
new file mode 100644
index 0000000..47b4b51
Binary files /dev/null and b/include/setup/img/client_info.png differ
diff --git a/include/setup/img/create_an_app_button.png b/include/setup/img/create_an_app_button.png
new file mode 100644
index 0000000..8805826
Binary files /dev/null and b/include/setup/img/create_an_app_button.png differ
diff --git a/include/setup/img/create_an_app_name.png b/include/setup/img/create_an_app_name.png
new file mode 100644
index 0000000..c4a9a4f
Binary files /dev/null and b/include/setup/img/create_an_app_name.png differ
diff --git a/include/setup/img/redirect.png b/include/setup/img/redirect.png
new file mode 100644
index 0000000..f93cc2b
Binary files /dev/null and b/include/setup/img/redirect.png differ
diff --git a/include/setup/img/save.png b/include/setup/img/save.png
new file mode 100644
index 0000000..77aeb2f
Binary files /dev/null and b/include/setup/img/save.png differ
diff --git a/include/setup/index.php b/include/setup/index.php
new file mode 100644
index 0000000..16d72f9
--- /dev/null
+++ b/include/setup/index.php
@@ -0,0 +1,180 @@
+
+
+ Spotifious Setup
+
+
+
+
+
+
+
+
+
Spotifious Setup
+
+ Hi! In order to fully use Spotifious (search playlists, star
+ tracks, etc.), you need to generate a Spotify API key by
+ creating a Spotify app.
+
+
+ NOTE: this server will automatically close in 5
+ minutes. If you get errors like "page not found," just reopen
+ Spotifious.
+
+
+
+
+
Instructions
+
+ Setting up the app is not very hard, but it has a couple
+ specific steps. Just follow these instructions, and you'll be
+ fine!
+
+
+ If you're worried about privacy,
+ here’s what I have to say.
+
+
+ If you already know how to make a Spotify app, you can enter the
+ ID and secret here. Please set the callback
+ URL correctly, though (step 8).
+
+ Click "Create an app."
+
+
+ The 'Create an app' button
+
+
+
+ Enter an application name and description. They can be anything you want.
+
+
+ This data will do nicely.
+
+
+
Click "Create"!
+
+ Note the "Client ID" and "Client Secret." You'll enter them
+ later.
+
+
Click the "Add URI" button to add a new Redirect URI.
+
+ Type http://localhost:11114/callback.php and click "Add"
+
+
+ Just type it in!
+
+
+
+ Save those changes!
+
+
+ The green one, please.
+
+
+
Copy and paste your Client ID and Client Secret below:
+
+
+
+
+ This will not be a blur on your screen.
+
+
+
Go back to Spotifious and finish your setup!
+
+
+
+
+
Privacy
+
+ Spotifious merely reads and writes your keys from and to your
+ hard drive. They are never used in a way that could compromise
+ their integrity other than in the Spotify query, as required by
+ the API. Spotifious itself never sends the data
+ anywhere else, for any reason, at any time.
+
+
+ You do not need to set up a Spotify app to use
+ Spotifious, but you lose a lot of functionality. If you would
+ prefer not to use this part of Spotify,
+ click here.
+
+ 
+ 
+ 
+ 
+