@@ -14,11 +14,11 @@ const (
14
14
)
15
15
16
16
func SetupAuthMenu () error {
17
- items := alfred.AlfredItems {
18
- Items : []alfred.AlfredItem {
19
- alfred.AlfredItem {
17
+ items := alfred.Items {
18
+ Items : []alfred.Item {
19
+ alfred.Item {
20
20
Title : "Authenticate to Spot" ,
21
- Icon : alfred.AlfredIcon {
21
+ Icon : alfred.Icon {
22
22
Path : "icons/configuration.png" ,
23
23
},
24
24
Valid : newFalse (),
@@ -31,9 +31,9 @@ func SetupAuthMenu() error {
31
31
}
32
32
33
33
func ClientIdMenuInstruction () error {
34
- items := alfred.AlfredItems {
35
- Items : []alfred.AlfredItem {
36
- alfred.AlfredItem {
34
+ items := alfred.Items {
35
+ Items : []alfred.Item {
36
+ alfred.Item {
37
37
Title : "Paste the Client Id above and press enter" ,
38
38
},
39
39
},
@@ -43,9 +43,9 @@ func ClientIdMenuInstruction() error {
43
43
}
44
44
45
45
func ClientIdMenuStepFinished () error {
46
- items := alfred.AlfredItems {
47
- Items : []alfred.AlfredItem {
48
- alfred.AlfredItem {
46
+ items := alfred.Items {
47
+ Items : []alfred.Item {
48
+ alfred.Item {
49
49
Title : "The client id is set, press enter to close" ,
50
50
},
51
51
},
@@ -55,9 +55,9 @@ func ClientIdMenuStepFinished() error {
55
55
}
56
56
57
57
func ClientSecretMenuInstruction () error {
58
- items := alfred.AlfredItems {
59
- Items : []alfred.AlfredItem {
60
- alfred.AlfredItem {
58
+ items := alfred.Items {
59
+ Items : []alfred.Item {
60
+ alfred.Item {
61
61
Title : "Paste the Client Secret above and press enter" ,
62
62
},
63
63
},
@@ -67,9 +67,9 @@ func ClientSecretMenuInstruction() error {
67
67
}
68
68
69
69
func ClientSecretMenuStepFinished () error {
70
- items := alfred.AlfredItems {
71
- Items : []alfred.AlfredItem {
72
- alfred.AlfredItem {
70
+ items := alfred.Items {
71
+ Items : []alfred.Item {
72
+ alfred.Item {
73
73
Title : "Setup is now complete! Press enter to close" ,
74
74
},
75
75
},
@@ -85,29 +85,29 @@ func StatusMenu(spotifyStatus spotify.Status) error {
85
85
playerStatusIcon = "icons/paused.png"
86
86
}
87
87
88
- items := alfred.AlfredItems {
89
- Items : []alfred.AlfredItem {
90
- alfred.AlfredItem {
88
+ items := alfred.Items {
89
+ Items : []alfred.Item {
90
+ alfred.Item {
91
91
Title : spotifyStatus .SongTitle ,
92
92
Subtitle : fmt .Sprintf ("%s by %s" , spotifyStatus .Album , spotifyStatus .Artist ),
93
93
Arg : "-action playpause" ,
94
- Icon : alfred.AlfredIcon {
94
+ Icon : alfred.Icon {
95
95
Path : playerStatusIcon ,
96
96
},
97
97
},
98
- alfred.AlfredItem {
98
+ alfred.Item {
99
99
Title : spotifyStatus .Artist ,
100
100
Subtitle : "More from this artist..." ,
101
- Icon : alfred.AlfredIcon {
101
+ Icon : alfred.Icon {
102
102
Path : "icons/artist.png" ,
103
103
},
104
104
Valid : newFalse (),
105
105
Autocomplete : fmt .Sprintf ("-artist=\" %s\" " , spotifyStatus .Artist ),
106
106
},
107
- alfred.AlfredItem {
107
+ alfred.Item {
108
108
Title : spotifyStatus .Album ,
109
109
Subtitle : "More from this album..." ,
110
- Icon : alfred.AlfredIcon {
110
+ Icon : alfred.Icon {
111
111
Path : "icons/album.png" ,
112
112
},
113
113
Valid : newFalse (),
@@ -127,27 +127,27 @@ func ControlsMenu(spotifyStatus spotify.Status) error {
127
127
playerStatusIcon = "icons/paused.png"
128
128
}
129
129
130
- items := alfred.AlfredItems {
131
- Items : []alfred.AlfredItem {
132
- alfred.AlfredItem {
130
+ items := alfred.Items {
131
+ Items : []alfred.Item {
132
+ alfred.Item {
133
133
Title : "Next Track" ,
134
134
Arg : "--action next" ,
135
- Icon : alfred.AlfredIcon {
135
+ Icon : alfred.Icon {
136
136
Path : "icons/next.png" ,
137
137
},
138
138
},
139
- alfred.AlfredItem {
139
+ alfred.Item {
140
140
Title : "Previous Track" ,
141
141
Arg : "--action previous" ,
142
- Icon : alfred.AlfredIcon {
142
+ Icon : alfred.Icon {
143
143
Path : "icons/previous.png" ,
144
144
},
145
145
},
146
- alfred.AlfredItem {
146
+ alfred.Item {
147
147
Title : spotifyStatus .SongTitle ,
148
148
Subtitle : fmt .Sprintf ("%s by %s" , spotifyStatus .Album , spotifyStatus .Artist ),
149
149
Arg : "--action playpause" ,
150
- Icon : alfred.AlfredIcon {
150
+ Icon : alfred.Icon {
151
151
Path : playerStatusIcon ,
152
152
},
153
153
},
@@ -169,31 +169,31 @@ func popularityToMeter(popularity int) string {
169
169
return meter
170
170
}
171
171
172
- func albumItem (album client.SimpleAlbum ) alfred.AlfredItem {
173
- return alfred.AlfredItem {
172
+ func albumItem (album client.SimpleAlbum ) alfred.Item {
173
+ return alfred.Item {
174
174
Uid : string (album .URI ),
175
175
Title : album .Name ,
176
176
Valid : newFalse (),
177
177
Autocomplete : fmt .Sprintf ("-album=\" %s\" " , album .Name ),
178
- Icon : alfred.AlfredIcon {
178
+ Icon : alfred.Icon {
179
179
Path : "icons/album.png" ,
180
180
},
181
- Mods : alfred.AlfredMods {
182
- Ctrl : alfred.AlfredMod {
181
+ Mods : alfred.Mods {
182
+ Ctrl : alfred.Mod {
183
183
Arg : fmt .Sprintf ("--action revealinspotify --context %s" , album .URI ),
184
184
Subtitle : "Reveal in Spotify" ,
185
185
},
186
186
},
187
187
}
188
188
}
189
189
190
- func albumItemWithArtist (album client.SimpleAlbum , artist string ) alfred.AlfredItem {
190
+ func albumItemWithArtist (album client.SimpleAlbum , artist string ) alfred.Item {
191
191
item := albumItem (album )
192
192
item .Autocomplete = fmt .Sprintf ("-artist=\" %s\" -album=\" %s\" " , artist , album .Name )
193
193
return item
194
194
}
195
195
196
- func trackItem (track client.FullTrack , contextType int ) alfred.AlfredItem {
196
+ func trackItem (track client.FullTrack , contextType int ) alfred.Item {
197
197
var arg string
198
198
if contextType == albumContext {
199
199
arg = fmt .Sprintf ("--action playtrack --track %s --context %s" , track .URI , track .Album .URI )
@@ -203,35 +203,35 @@ func trackItem(track client.FullTrack, contextType int) alfred.AlfredItem {
203
203
arg = fmt .Sprintf ("--action playtrack --track %s" , track .URI )
204
204
}
205
205
206
- return alfred.AlfredItem {
206
+ return alfred.Item {
207
207
Uid : string (track .URI ),
208
208
Title : track .Name ,
209
209
Subtitle : popularityToMeter (track .Popularity ),
210
- Icon : alfred.AlfredIcon {
210
+ Icon : alfred.Icon {
211
211
Path : "icons/track.png" ,
212
212
},
213
213
Arg : arg ,
214
- Mods : alfred.AlfredMods {
215
- Ctrl : alfred.AlfredMod {
214
+ Mods : alfred.Mods {
215
+ Ctrl : alfred.Mod {
216
216
Arg : fmt .Sprintf ("--action revealinspotify --context %s" , track .URI ),
217
217
Subtitle : "Reveal in Spotify" ,
218
218
},
219
219
},
220
220
}
221
221
}
222
222
223
- func artistItem (artist client.FullArtist ) alfred.AlfredItem {
224
- return alfred.AlfredItem {
223
+ func artistItem (artist client.FullArtist ) alfred.Item {
224
+ return alfred.Item {
225
225
Uid : string (artist .URI ),
226
226
Title : artist .Name ,
227
227
Subtitle : popularityToMeter (artist .Popularity ),
228
- Icon : alfred.AlfredIcon {
228
+ Icon : alfred.Icon {
229
229
Path : "icons/artist.png" ,
230
230
},
231
231
Valid : newFalse (),
232
232
Autocomplete : fmt .Sprintf ("-artist=\" %s\" " , artist .Name ),
233
- Mods : alfred.AlfredMods {
234
- Ctrl : alfred.AlfredMod {
233
+ Mods : alfred.Mods {
234
+ Ctrl : alfred.Mod {
235
235
Arg : fmt .Sprintf ("--action revealinspotify --context %s" , artist .URI ),
236
236
Subtitle : "Reveal in Spotify" ,
237
237
},
@@ -252,14 +252,14 @@ func AlbumDetailMenu(album string, args []string) error {
252
252
}
253
253
254
254
tracks := searchResults .Tracks .Tracks
255
- items := make ([]alfred.AlfredItem , 0 , len (tracks ))
255
+ items := make ([]alfred.Item , 0 , len (tracks ))
256
256
257
257
for _ , track := range tracks {
258
258
items = append (items , trackItem (track , albumContext ))
259
259
260
260
}
261
261
262
- alfredItems := alfred.AlfredItems {
262
+ alfredItems := alfred.Items {
263
263
Items : items ,
264
264
}
265
265
@@ -280,7 +280,7 @@ func ArtistDetailMenu(artist string, args []string) error {
280
280
281
281
albums := searchResults .Albums .Albums
282
282
tracks := searchResults .Tracks .Tracks
283
- items := make ([]alfred.AlfredItem , 0 , len (albums )+ len (tracks ))
283
+ items := make ([]alfred.Item , 0 , len (albums )+ len (tracks ))
284
284
285
285
for _ , track := range tracks {
286
286
items = append (items , trackItem (track , artistContext ))
@@ -292,7 +292,7 @@ func ArtistDetailMenu(artist string, args []string) error {
292
292
293
293
}
294
294
295
- alfredItems := alfred.AlfredItems {
295
+ alfredItems := alfred.Items {
296
296
Items : items ,
297
297
}
298
298
@@ -314,7 +314,7 @@ func SearchMenu(args []string) error {
314
314
albums := searchResults .Albums .Albums
315
315
tracks := searchResults .Tracks .Tracks
316
316
artists := searchResults .Artists .Artists
317
- items := make ([]alfred.AlfredItem , 0 , len (albums )+ len (tracks )+ len (artists ))
317
+ items := make ([]alfred.Item , 0 , len (albums )+ len (tracks )+ len (artists ))
318
318
319
319
for _ , track := range tracks {
320
320
items = append (items , trackItem (track , artistContext ))
@@ -331,7 +331,7 @@ func SearchMenu(args []string) error {
331
331
332
332
}
333
333
334
- alfredItems := alfred.AlfredItems {
334
+ alfredItems := alfred.Items {
335
335
Items : items ,
336
336
}
337
337
0 commit comments