Merge pull request #102 from citelao/hotfix/backslashes-playlists

Fix searching backslashed playlists
citelao · Aug 2, 2017 · 27e6f06 · 27e6f06
2 parents 74fb22d + 75e4943
commit 27e6f06
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog #
 
+## v0.13.3.3 #
+- Fixed: Can now add playlists with `\` in their titles.
+- Fixed: Removed light-colored edge of some icons
+
 ## v0.13.3.2 #
 - Fixed: Alfred variables are now more reliably passed to the workflow. Should
  fix several people's configuration bugs.

diff --git 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.3.2](https://github.com/citelao/Spotify-for-Alfred/archive/master.zip) | Latest dev build: [v0.13.3.2](https://github.com/citelao/Spotify-for-Alfred/archive/dev.zip)
+Latest version: [v0.13.3.3](https://github.com/citelao/Spotify-for-Alfred/archive/master.zip) | Latest dev build: [v0.13.3.3](https://github.com/citelao/Spotify-for-Alfred/archive/dev.zip)
 
 An in-depth [installation guide](https://ben.stolovitz.com/Spotify-for-Alfred/download/) is available on the Spotifious website.
 

diff --git a/dist/Spotifious.alfredworkflow b/dist/Spotifious.alfredworkflow
diff --git a/include/images/dash.png b/include/images/dash.png
diff --git a/include/images/disabled.png b/include/images/disabled.png
diff --git a/include/images/psd/dash.psd b/include/images/psd/dash.psd
diff --git a/include/images/psd/disabled.psd b/include/images/psd/disabled.psd
diff --git a/include/images/psd/track.psd b/include/images/psd/track.psd
diff --git a/include/images/psd/unchecked.psd b/include/images/psd/unchecked.psd
diff --git a/include/images/single.png b/include/images/single.png
diff --git a/include/images/track.png b/include/images/track.png
diff --git a/include/images/unchecked.png b/include/images/unchecked.png
diff --git a/info.plist b/info.plist
@@ -1018,7 +1018,7 @@ Spotifious works out of the box (just type `spotifious` in Alfred), but works be
  </dict>
  </dict>
  <key>version</key>
- <string>0.13.3.2</string>
+ <string>0.13.3.3</string>
  <key>webaddress</key>
  <string>https://github.com/citelao/Spotify-for-Alfred</string>
 </dict>

diff --git a/src/citelao/OhAlfred/OhAlfred.php b/src/citelao/OhAlfred/OhAlfred.php
@@ -134,7 +134,7 @@ public function plist($plist, $setting, $value = -1) {
  unset($this->plists[$plist]);
 
  if(!is_string($value)) {
- $value = '"' . str_replace('"', '\"', str_replace('\"', '\\\"', json_encode($value))) . '"';
+ $value = '"' . addslashes(json_encode($value)) . '"';
  }
 
  $escaped_plist = escapeshellarg($plist);

diff --git a/src/citelao/Spotifious/Spotifious.php b/src/citelao/Spotifious/Spotifious.php
@@ -172,7 +172,7 @@ public function process($action) {
 
  // Handle JSON if given
 
- print_r("GGGG");
+ // print_r("GGGG");
  if($action[0] == "{") {
  $json = JsonParser::parse($action);
  $options = (isset($json->options)) 
@@ -390,7 +390,7 @@ protected function update_playlists_cache($api) {
  ? $playlist->owner->display_name
  : (property_exists($playlist->owner, 'id'))
  ? $playlist->owner->id
- : "unkown"
+ : 'unknown'
  );
  }
  $datetime = new \DateTime("now");