diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca1ba12..08377b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog #
+## v0.13.1 ##
+- Fixed: Alfred 3 compatibility
+- Fixed: America appears first in country selection
+
## v0.13 ##
- Added: preliminary scaffolding for web API (playlists, starring, all of it is coming)
- Added: new settings menu.
diff --git a/README.md b/README.md
index 0d9db74..f72aebb 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.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)
+Latest version: [v0.13.1](https://github.com/citelao/Spotify-for-Alfred/archive/master.zip) | Latest dev build: [v0.13.1](https://github.com/citelao/Spotify-for-Alfred/archive/dev.zip)
An in-depth [installation guide](http://ben.stolovitz.com/Spotify-for-Alfred/download/) is available on the Spotifious website.
diff --git a/dist/Spotifious.alfredworkflow b/dist/Spotifious.alfredworkflow
index 4907a1f..d1d6cf3 100644
Binary files a/dist/Spotifious.alfredworkflow and b/dist/Spotifious.alfredworkflow differ
diff --git a/info.plist b/info.plist
index 178b824..b455817 100644
--- a/info.plist
+++ b/info.plist
@@ -17,6 +17,8 @@
0
modifiersubtext
+ vitoclose
+
destinationuid
@@ -25,6 +27,8 @@
0
modifiersubtext
+ vitoclose
+
30E2AA18-937F-4B5D-B685-7852B9717F34
@@ -36,6 +40,8 @@
0
modifiersubtext
+ vitoclose
+
4BB22960-369A-4674-AF29-00CCE1603B53
@@ -47,6 +53,8 @@
0
modifiersubtext
+ vitoclose
+
5610E60C-68BF-4445-BAE3-CB55DEA70D99
@@ -58,6 +66,8 @@
0
modifiersubtext
+ vitoclose
+
6B1397DB-E737-4607-8181-27D9DFE70E2C
@@ -71,6 +81,8 @@
0
modifiersubtext
+ vitoclose
+
7858554D-2173-462A-B03D-1078EC7059D6
@@ -82,6 +94,8 @@
0
modifiersubtext
+ vitoclose
+
8020A500-17C9-43BA-B17A-00D35E460EB6
@@ -93,6 +107,8 @@
0
modifiersubtext
+ vitoclose
+
86EAA0E6-6086-4BC4-8CE7-0673F392C77F
@@ -104,6 +120,8 @@
0
modifiersubtext
+ vitoclose
+
AE6160D1-56EA-4416-991E-CF12B874FFD3
@@ -115,6 +133,8 @@
0
modifiersubtext
+ vitoclose
+
B02E0659-E11A-4746-ADB7-2C2C0A8BD8BB
@@ -126,6 +146,8 @@
0
modifiersubtext
+ vitoclose
+
BFFC58C1-626F-4091-A0A4-61034DDD10D0
@@ -137,6 +159,8 @@
0
modifiersubtext
+ vitoclose
+
C5E43F66-AD1D-4D8D-9E4A-D7855C8F5AE2
@@ -148,6 +172,8 @@
0
modifiersubtext
+ vitoclose
+
F1B61D14-D686-468D-9373-AB4FC3EEE3C8
@@ -159,6 +185,8 @@
0
modifiersubtext
+ vitoclose
+
F4A2A879-4C5A-4532-BF35-02BAAD863581
@@ -170,6 +198,8 @@
0
modifiersubtext
+ vitoclose
+
@@ -186,6 +216,8 @@
config
+ alfredfiltersresults
+
argumenttype
1
escaping
@@ -209,6 +241,10 @@
# you can generate a log file to help me. Modify the
# first line of this script so it looks like this:
# php -f main.php -- "{query}" | tee ~/Desktop/Spotifious.log
+ scriptargtype
+ 0
+ scriptfile
+
subtext
Search for artists, tracks, or albums
title
@@ -223,7 +259,7 @@
uid
18496AC4-EA42-444C-A906-642E38259C96
version
- 0
+ 2
type
@@ -231,7 +267,7 @@
uid
C8A768AF-C5D9-47A1-B499-8B0D3C844A99
version
- 0
+ 1
config
@@ -252,7 +288,7 @@
uid
86EAA0E6-6086-4BC4-8CE7-0673F392C77F
version
- 0
+ 1
config
@@ -279,7 +315,7 @@
uid
AE6160D1-56EA-4416-991E-CF12B874FFD3
version
- 1
+ 2
config
@@ -295,6 +331,10 @@
# you can generate a log file to help me. Modify the
# first line of this script so it looks like this:
# php -f action.php -- "{query}" | tee ~/Desktop/SpotifiousAction.log
+ scriptargtype
+ 0
+ scriptfile
+
type
0
@@ -303,7 +343,7 @@
uid
6B1397DB-E737-4607-8181-27D9DFE70E2C
version
- 0
+ 2
config
@@ -316,7 +356,7 @@
uid
F4A2A879-4C5A-4532-BF35-02BAAD863581
version
- 0
+ 1
config
@@ -337,7 +377,7 @@
uid
8020A500-17C9-43BA-B17A-00D35E460EB6
version
- 0
+ 1
config
@@ -366,7 +406,7 @@
uid
7858554D-2173-462A-B03D-1078EC7059D6
version
- 1
+ 2
config
@@ -387,7 +427,7 @@
uid
4BB22960-369A-4674-AF29-00CCE1603B53
version
- 0
+ 1
config
@@ -416,7 +456,7 @@
uid
5610E60C-68BF-4445-BAE3-CB55DEA70D99
version
- 1
+ 2
config
@@ -437,7 +477,7 @@
uid
C5E43F66-AD1D-4D8D-9E4A-D7855C8F5AE2
version
- 0
+ 1
config
@@ -466,7 +506,7 @@
uid
30E2AA18-937F-4B5D-B685-7852B9717F34
version
- 1
+ 2
config
@@ -487,7 +527,7 @@
uid
B02E0659-E11A-4746-ADB7-2C2C0A8BD8BB
version
- 0
+ 1
config
@@ -516,7 +556,7 @@
uid
BFFC58C1-626F-4091-A0A4-61034DDD10D0
version
- 1
+ 2
config
@@ -537,7 +577,7 @@
uid
F1B61D14-D686-468D-9373-AB4FC3EEE3C8
version
- 0
+ 1
config
@@ -566,12 +606,12 @@
uid
73FAFE96-4B16-4AB5-B181-229B4BB79E25
version
- 1
+ 2
readme
# Spotifious
-# v0.13
+# v0.13.1
I’ve worked a long time on it to make it as good as it can be, and if you have any ideas to make it better or if you need to complain, leave me a note on my GitHub page or on the forum threads, linked below.
@@ -591,85 +631,119 @@ This code’s license can be found in LICENSE.md
18496AC4-EA42-444C-A906-642E38259C96
+ xpos
+ 300
ypos
10
30E2AA18-937F-4B5D-B685-7852B9717F34
+ xpos
+ 100
ypos
990
4BB22960-369A-4674-AF29-00CCE1603B53
+ xpos
+ 100
ypos
620
5610E60C-68BF-4445-BAE3-CB55DEA70D99
+ xpos
+ 100
ypos
730
6B1397DB-E737-4607-8181-27D9DFE70E2C
+ xpos
+ 500
ypos
130
73FAFE96-4B16-4AB5-B181-229B4BB79E25
+ xpos
+ 100
ypos
1470
7858554D-2173-462A-B03D-1078EC7059D6
+ xpos
+ 100
ypos
490
8020A500-17C9-43BA-B17A-00D35E460EB6
+ xpos
+ 100
ypos
380
86EAA0E6-6086-4BC4-8CE7-0673F392C77F
+ xpos
+ 100
ypos
10
AE6160D1-56EA-4416-991E-CF12B874FFD3
+ xpos
+ 100
ypos
120
B02E0659-E11A-4746-ADB7-2C2C0A8BD8BB
+ xpos
+ 100
ypos
1120
BFFC58C1-626F-4091-A0A4-61034DDD10D0
+ xpos
+ 100
ypos
1230
C5E43F66-AD1D-4D8D-9E4A-D7855C8F5AE2
+ xpos
+ 100
ypos
880
C8A768AF-C5D9-47A1-B499-8B0D3C844A99
+ xpos
+ 500
ypos
10
F1B61D14-D686-468D-9373-AB4FC3EEE3C8
+ xpos
+ 100
ypos
1360
F4A2A879-4C5A-4532-BF35-02BAAD863581
+ xpos
+ 100
ypos
230
+ version
+
webaddress
https://github.com/citelao/Spotify-for-Alfred
diff --git a/src/citelao/OhAlfred/OhAlfred.php b/src/citelao/OhAlfred/OhAlfred.php
index 118c210..8b936eb 100644
--- a/src/citelao/OhAlfred/OhAlfred.php
+++ b/src/citelao/OhAlfred/OhAlfred.php
@@ -49,22 +49,34 @@ public function workflow()
// Get the cache directory
public function cache() {
- if($this->cache == null)
- $this->cache = $this->home() . "/Library/Caches/com.runningwithcrayons.Alfred-2/Workflow Data/" . $this->name() . "/";
+ if($this->cache == null) {
+ if(isset($_ENV['alfred_workflow_data'])) {
+ $this->cache = $_ENV['alfred_workflow_cache'];
+ } else {
+ $this->cache = $this->home() . "/Library/Caches/com.runningwithcrayons.Alfred-2/Workflow Data/" . $this->name() . "/";
+ }
+ }
- if (!file_exists($this->cache))
+ if (!file_exists($this->cache)) {
mkdir($this->cache);
+ }
return $this->cache;
}
// Get the storage directory
public function storage() {
- if($this->storage == null)
- $this->storage = $this->home() . "/Library/Application Support/Alfred 2/Workflow Data/" . $this->name() . "/";
+ if($this->storage == null) {
+ if(isset($_ENV['alfred_workflow_data'])) {
+ $this->storage = $_ENV['alfred_workflow_data'];
+ } else {
+ $this->storage = $this->home() . "/Library/Application Support/Alfred 2/Workflow Data/" . $this->name() . "/";
+ }
+ }
- if (!file_exists($this->storage))
+ if (!file_exists($this->storage)) {
mkdir($this->storage);
+ }
return $this->storage;
}
diff --git a/src/citelao/Spotifious/Menus/SetupCountryCode.php b/src/citelao/Spotifious/Menus/SetupCountryCode.php
index dd2243e..78dc931 100644
--- a/src/citelao/Spotifious/Menus/SetupCountryCode.php
+++ b/src/citelao/Spotifious/Menus/SetupCountryCode.php
@@ -69,7 +69,7 @@ protected function countrySort($a, $b) {
// Give priority to common countries.
// Arbitrarily decided by me.
$common = array(
- "United States", // America first hehehe
+ "United States of America", // America first hehehe
"United Kingdom",
"Canada",
"Australia",