Skip to content
This repository has been archived by the owner on Jan 10, 2020. It is now read-only.

Commit

Permalink
Only suppress UIDs in Alfred feedback #1
Browse files Browse the repository at this point in the history
  • Loading branch information
@deanishe
deanishe committed Nov 27, 2017
1 parent 2f23a06 commit 938580a
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 165 deletions.
Binary file removed Safari-Assistant-0.4.3.alfredworkflow
View file
Binary file not shown.
Binary file added Safari-Assistant-0.4.4.alfredworkflow
View file
Binary file not shown.
7 changes: 0 additions & 7 deletions bookmarks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,5 @@ func (b *bmURLer) Icon() *aw.Icon {
return IconBookmark
}

// uidLess removes the UID from a URLer
type uidLess struct {
URLer
}

func (u *uidLess) UID() string { return "" }

// bookmarkItem returns a feedback Item for Safari Bookmark.
func bookmarkItem(bm *safari.Bookmark) *aw.Item { return URLerItem(&bmURLer{bm}) }
2 changes: 1 addition & 1 deletion folders.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func doFilterFolder() error {

for _, it := range items {
if bm, ok := it.(*safari.Bookmark); ok {
URLerItem(&uidLess{&bmURLer{bm}})
URLerItem(&bmURLer{bm}, true)
} else if f2, ok := it.(*safari.Folder); ok {
folderItem(f2)
} else {
Expand Down
158 changes: 3 additions & 155 deletions info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,19 +486,6 @@
<false/>
</dict>
</array>
<key>579B46DD-D411-485F-947D-8B7C9126549E</key>
<array>
<dict>
<key>destinationuid</key>
<string>E1234DFD-ECAC-43B7-B745-895441AE9D51</string>
<key>modifiers</key>
<integer>0</integer>
<key>modifiersubtext</key>
<string></string>
<key>vitoclose</key>
<false/>
</dict>
</array>
<key>5AC563A6-AD3A-4740-942F-24C0BCD5468E</key>
<array/>
<key>5B315855-6C66-4A15-BD93-1E711B82CCEB</key>
Expand Down Expand Up @@ -605,19 +592,6 @@
<false/>
</dict>
</array>
<key>70ADDBDC-3466-471F-8FC0-0D08CBB6639C</key>
<array>
<dict>
<key>destinationuid</key>
<string>7A20C945-1F59-4C0C-8694-F37BF0F52D5B</string>
<key>modifiers</key>
<integer>0</integer>
<key>modifiersubtext</key>
<string></string>
<key>vitoclose</key>
<false/>
</dict>
</array>
<key>721AAE10-9173-47C9-98B0-B673CFBD37B2</key>
<array>
<dict>
Expand Down Expand Up @@ -988,23 +962,13 @@
<array>
<dict>
<key>destinationuid</key>
<string>579B46DD-D411-485F-947D-8B7C9126549E</string>
<key>modifiers</key>
<integer>1048576</integer>
<key>modifiersubtext</key>
<string></string>
<key>vitoclose</key>
<true/>
</dict>
<dict>
<key>destinationuid</key>
<string>70ADDBDC-3466-471F-8FC0-0D08CBB6639C</string>
<string>D09FFBBC-0405-4F55-BC74-5B34AA873FB1</string>
<key>modifiers</key>
<integer>0</integer>
<key>modifiersubtext</key>
<string></string>
<key>vitoclose</key>
<true/>
<false/>
</dict>
</array>
<key>D94FFE88-0A1C-49FE-9F45-8DDAAEECD0C8</key>
Expand Down Expand Up @@ -1476,25 +1440,6 @@ variables={allvars}
<key>version</key>
<integer>2</integer>
</dict>
<dict>
<key>config</key>
<dict>
<key>externaltriggerid</key>
<string>open-uid</string>
<key>passinputasargument</key>
<true/>
<key>passvariables</key>
<true/>
<key>workflowbundleid</key>
<string>self</string>
</dict>
<key>type</key>
<string>alfred.workflow.output.callexternaltrigger</string>
<key>uid</key>
<string>E1234DFD-ECAC-43B7-B745-895441AE9D51</string>
<key>version</key>
<integer>1</integer>
</dict>
<dict>
<key>config</key>
<dict>
Expand Down Expand Up @@ -1555,27 +1500,6 @@ variables={allvars}
<key>version</key>
<integer>2</integer>
</dict>
<dict>
<key>config</key>
<dict>
<key>argument</key>
<string>.
/--- OPEN UID IN ---\
query={query}
variables={allvars}
\-------------------/</string>
<key>cleardebuggertext</key>
<false/>
<key>processoutputs</key>
<true/>
</dict>
<key>type</key>
<string>alfred.workflow.utility.debug</string>
<key>uid</key>
<string>579B46DD-D411-485F-947D-8B7C9126549E</string>
<key>version</key>
<integer>1</integer>
</dict>
<dict>
<key>config</key>
<dict>
Expand Down Expand Up @@ -1635,46 +1559,6 @@ variables={allvars}
<key>version</key>
<integer>1</integer>
</dict>
<dict>
<key>config</key>
<dict>
<key>externaltriggerid</key>
<string>browse-folder</string>
<key>passinputasargument</key>
<true/>
<key>passvariables</key>
<true/>
<key>workflowbundleid</key>
<string>self</string>
</dict>
<key>type</key>
<string>alfred.workflow.output.callexternaltrigger</string>
<key>uid</key>
<string>7A20C945-1F59-4C0C-8694-F37BF0F52D5B</string>
<key>version</key>
<integer>1</integer>
</dict>
<dict>
<key>config</key>
<dict>
<key>argument</key>
<string>.
/--- BROWSE FOLDERS IN ---\
query={query}
variables={allvars}
\-------------------------/</string>
<key>cleardebuggertext</key>
<false/>
<key>processoutputs</key>
<true/>
</dict>
<key>type</key>
<string>alfred.workflow.utility.debug</string>
<key>uid</key>
<string>70ADDBDC-3466-471F-8FC0-0D08CBB6639C</string>
<key>version</key>
<integer>1</integer>
</dict>
<dict>
<key>config</key>
<dict>
Expand Down Expand Up @@ -3738,15 +3622,6 @@ In either case, use ⌘C on a script/bookmarklet to copy the appropriate value t
<key>ypos</key>
<integer>2630</integer>
</dict>
<key>579B46DD-D411-485F-947D-8B7C9126549E</key>
<dict>
<key>colorindex</key>
<integer>11</integer>
<key>xpos</key>
<integer>590</integer>
<key>ypos</key>
<integer>610</integer>
</dict>
<key>5AC563A6-AD3A-4740-942F-24C0BCD5468E</key>
<dict>
<key>colorindex</key>
Expand Down Expand Up @@ -3840,15 +3715,6 @@ In either case, use ⌘C on a script/bookmarklet to copy the appropriate value t
<key>ypos</key>
<integer>2470</integer>
</dict>
<key>70ADDBDC-3466-471F-8FC0-0D08CBB6639C</key>
<dict>
<key>colorindex</key>
<integer>5</integer>
<key>xpos</key>
<integer>590</integer>
<key>ypos</key>
<integer>750</integer>
</dict>
<key>721AAE10-9173-47C9-98B0-B673CFBD37B2</key>
<dict>
<key>colorindex</key>
Expand Down Expand Up @@ -3924,15 +3790,6 @@ Filter within a specific bookmarks folder</string>
<key>ypos</key>
<integer>770</integer>
</dict>
<key>7A20C945-1F59-4C0C-8694-F37BF0F52D5B</key>
<dict>
<key>colorindex</key>
<integer>5</integer>
<key>xpos</key>
<integer>700</integer>
<key>ypos</key>
<integer>720</integer>
</dict>
<key>7A8B3A1B-D512-42D5-BD53-917CE2DF84FE</key>
<dict>
<key>colorindex</key>
Expand Down Expand Up @@ -4332,15 +4189,6 @@ Filter all bookmark folders</string>
<key>ypos</key>
<integer>2150</integer>
</dict>
<key>E1234DFD-ECAC-43B7-B745-895441AE9D51</key>
<dict>
<key>colorindex</key>
<integer>11</integer>
<key>xpos</key>
<integer>700</integer>
<key>ypos</key>
<integer>580</integer>
</dict>
<key>E157FBA9-1D2B-413A-A321-3DCD07AF51CA</key>
<dict>
<key>colorindex</key>
Expand Down Expand Up @@ -4430,7 +4278,7 @@ Filter all bookmark folders</string>
<string></string>
</dict>
<key>version</key>
<string>0.4.3</string>
<string>0.4.4</string>
<key>webaddress</key>
<string>https://github.com/deanishe/alfred-safari-assistant/blob/master/README.md</string>
</dict>
Expand Down
12 changes: 10 additions & 2 deletions urls.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,10 @@ type URLer interface {
}

// URLerItem returns a feedback Item for a URLer.
func URLerItem(u URLer) *aw.Item {
func URLerItem(u URLer, noUID ...bool) *aw.Item {

it := wf.NewItem(u.Title()).
Subtitle(u.URL()).
UID(u.UID()).
Valid(true).
Copytext(u.Copytext()).
Largetype(u.Largetype()).
Expand All @@ -38,6 +37,15 @@ func URLerItem(u URLer) *aw.Item {
Var("ALSF_URL", u.URL()).
Var("action", "open")

var b bool
if len(noUID) > 0 {
b = noUID[0]
}

if !b {
it.UID(u.UID())
}

URL, err := url.Parse(u.URL())
if err == nil {

Expand Down

0 comments on commit 938580a

Please sign in to comment.