Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master: Fixed incorrect notification glitch #63

Merged
merged 33 commits into from
Jan 6, 2016
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
2ae6b59
plugin work whoo whoo
citelao Jan 29, 2015
0427a88
merge dev
citelao Jan 30, 2015
446eee1
timeout nonblocking
citelao Feb 20, 2015
5ed62b4
more work
citelao May 13, 2015
149a8be
fixed output glitch
citelao May 13, 2015
57e4dd7
Merge pull request #62 from citelao/hotfix-output
citelao May 13, 2015
5956652
sublime project
citelao May 14, 2015
1d2790e
Merge branch 'dev' into feature-plugin
citelao May 14, 2015
5d46aa5
I think I have API working
citelao May 15, 2015
a7d72e4
popup again and disabled checkbox
citelao May 15, 2015
aa153e9
settings menu
citelao May 15, 2015
c9b430b
returning
citelao May 15, 2015
da9a672
versions
citelao May 15, 2015
043d196
Merge pull request #64 from citelao/feature-plugin
citelao May 15, 2015
4c0d9f0
opt-out should work
citelao May 15, 2015
14b7760
Merge pull request #66 from citelao/feature-plugin
citelao May 15, 2015
76449c1
massive speed boost
citelao May 31, 2015
8c8b14a
massive speed boost
citelao May 31, 2015
673f6b5
fixed bug in new plists
citelao May 31, 2015
71dba32
some cleanups
citelao Jun 2, 2015
fc90505
removed sublime workspace
citelao Jun 10, 2015
98d7fb4
Fixing docs
citelao Jul 5, 2015
2efa95b
Added built version
citelao Jul 5, 2015
4cabf37
Fixing JSON errors
citelao Aug 17, 2015
f76070e
purge the workspace
citelao Aug 17, 2015
fd6a294
Travis CI
citelao Aug 17, 2015
ccc2bce
valid YML
citelao Aug 17, 2015
3faa725
valid travis YML
citelao Aug 17, 2015
b26be9c
skip testing for now
citelao Aug 17, 2015
6e63ec4
github deployment
citelao Aug 17, 2015
639dfb3
Added a playpause control panel action
citelao Jan 6, 2016
d81caa4
Fixed looping bugs
citelao Jan 6, 2016
bb4bad2
Merge pull request #69 from citelao/feature/cleanup
citelao Jan 6, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
popup again and disabled checkbox
  • Loading branch information
citelao committed May 15, 2015
commit a7d72e475856fcb681869e0874147ed517100a40
Binary file added include/images/disabled.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added include/images/psd/disabled.psd
Binary file not shown.
51 changes: 41 additions & 10 deletions info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,17 @@
<string></string>
</dict>
</array>
<key>F4A2A879-4C5A-4532-BF35-02BAAD863581</key>
<array>
<dict>
<key>destinationuid</key>
<string>18496AC4-EA42-444C-A906-642E38259C96</string>
<key>modifiers</key>
<integer>0</integer>
<key>modifiersubtext</key>
<string></string>
</dict>
</array>
</dict>
<key>createdby</key>
<string>Ben Stolovitz</string>
Expand Down Expand Up @@ -273,6 +284,8 @@
<dict>
<key>config</key>
<dict>
<key>concurrently</key>
<false/>
<key>escaping</key>
<integer>4</integer>
<key>script</key>
Expand All @@ -292,6 +305,19 @@
<key>version</key>
<integer>0</integer>
</dict>
<dict>
<key>config</key>
<dict>
<key>triggerid</key>
<string>search</string>
</dict>
<key>type</key>
<string>alfred.workflow.trigger.external</string>
<key>uid</key>
<string>F4A2A879-4C5A-4532-BF35-02BAAD863581</string>
<key>version</key>
<integer>0</integer>
</dict>
<dict>
<key>config</key>
<dict>
Expand Down Expand Up @@ -571,17 +597,17 @@ This code is MIT Licensed.</string>
<key>30E2AA18-937F-4B5D-B685-7852B9717F34</key>
<dict>
<key>ypos</key>
<real>830</real>
<real>990</real>
</dict>
<key>4BB22960-369A-4674-AF29-00CCE1603B53</key>
<dict>
<key>ypos</key>
<real>490</real>
<real>620</real>
</dict>
<key>5610E60C-68BF-4445-BAE3-CB55DEA70D99</key>
<dict>
<key>ypos</key>
<real>600</real>
<real>730</real>
</dict>
<key>6B1397DB-E737-4607-8181-27D9DFE70E2C</key>
<dict>
Expand All @@ -591,17 +617,17 @@ This code is MIT Licensed.</string>
<key>73FAFE96-4B16-4AB5-B181-229B4BB79E25</key>
<dict>
<key>ypos</key>
<real>1310</real>
<real>1470</real>
</dict>
<key>7858554D-2173-462A-B03D-1078EC7059D6</key>
<dict>
<key>ypos</key>
<real>360</real>
<real>490</real>
</dict>
<key>8020A500-17C9-43BA-B17A-00D35E460EB6</key>
<dict>
<key>ypos</key>
<real>250</real>
<real>380</real>
</dict>
<key>86EAA0E6-6086-4BC4-8CE7-0673F392C77F</key>
<dict>
Expand All @@ -616,17 +642,17 @@ This code is MIT Licensed.</string>
<key>B02E0659-E11A-4746-ADB7-2C2C0A8BD8BB</key>
<dict>
<key>ypos</key>
<real>960</real>
<real>1120</real>
</dict>
<key>BFFC58C1-626F-4091-A0A4-61034DDD10D0</key>
<dict>
<key>ypos</key>
<real>1070</real>
<real>1230</real>
</dict>
<key>C5E43F66-AD1D-4D8D-9E4A-D7855C8F5AE2</key>
<dict>
<key>ypos</key>
<real>720</real>
<real>880</real>
</dict>
<key>C8A768AF-C5D9-47A1-B499-8B0D3C844A99</key>
<dict>
Expand All @@ -636,7 +662,12 @@ This code is MIT Licensed.</string>
<key>F1B61D14-D686-468D-9373-AB4FC3EEE3C8</key>
<dict>
<key>ypos</key>
<real>1200</real>
<real>1360</real>
</dict>
<key>F4A2A879-4C5A-4532-BF35-02BAAD863581</key>
<dict>
<key>ypos</key>
<real>230</real>
</dict>
</dict>
<key>webaddress</key>
Expand Down
4 changes: 2 additions & 2 deletions src/citelao/Spotifious/Menus/Setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ public function output() {
$results[] = array(
'title' => '3. Link your Spotify application',
'subtitle' => 'Connect your Spotify application to Spotifious to search your playlists.',
'icon' => $this->applicationLinked ? 'include/images/checked.png' : 'include/images/unchecked.png',
'icon' => $this->applicationCreated ? $this->applicationLinked ? 'include/images/checked.png' : 'include/images/unchecked.png' : 'include/images/disabled.png',
'arg' => 'applink⟩',
'valid' => $this->applicationCreated
'valid' => $this->applicationCreated ? 'yes' : 'no'
);

$results[] = array(
Expand Down
24 changes: 14 additions & 10 deletions src/citelao/Spotifious/Spotifious.php
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,20 @@ public function process($action) {

if($command == 'country') {
$this->alfred->options('country', $splitAction[0]);

$as = new ApplicationApplescript("Alfred 2", 'run trigger "search" in workflow "com.citelao.spotifious"');
$as->run();

} else if($command == 'appsetup') {
// Autokill server in 10 minutes
$server = new Timeout(10 * 60, "php -S localhost:11114 & open 'http:https://localhost:11114/include/setup/index.php'");
$server->run();

} else if($command == 'applink') {
// Autokill server in 10 minutes
$server = new Timeout(10 * 60, "php -S localhost:11114 & open 'http:https://localhost:11114/include/setup/link.php'");
$server->run();

} else if($command == 'next') {
$song = $this->respondingSpotifyQuery('next track');

Expand Down Expand Up @@ -183,16 +197,6 @@ public function process($action) {
$as = new ApplicationApplescript("Spotify", "set sound volume to sound volume - 10");
$as->run();

} else if($command == 'appsetup') {
// Autokill server in 10 minutes
$server = new Timeout(10 * 60, "php -S localhost:11114 & open 'http:https://localhost:11114/include/setup/index.php'");
$server->run();

} else if($command == 'applink') {
// Autokill server in 10 minutes
$server = new Timeout(10 * 60, "php -S localhost:11114 & open 'http:https://localhost:11114/include/setup/link.php'");
$server->run();

} else if($command == 'spotify') {
$as = new ApplicationApplescript("Spotify", $splitAction[0]);
$as->run();
Expand Down