Return to previous screen on rescan

- Update icons
- Use path of project folder as copytext and action value

README.md

@@ -41,11 +41,11 @@ Usage
 - `.st rescan` — Reload cached list of projects
 - `.st config` — Show the current settings
     - `Workflow Is Up To Date` / `Workflow Update Available` — Install update or check for update
+    - `Rescan Projects` — Reload list of projects
     - `Edit Config File` — Open workflow's config file in Sublime Text
     - `View Help File` — Open README in your browser
     - `Report Issue` — Open GitHub issue tracker in your browser
     - `Visit Forum Thread` — Open workflow's thread on [alfredforum.com][forum]
-    - `Rescan Projects` — Reload list of projects
 
 You can enter the words `search` or `config` as a search query anywhere to jump to that screen.
 

cli.go

@@ -23,7 +23,7 @@ import (
 
 var (
 	opts = &options{}
-	cli  = flag.NewFlagSet("alfsubl", flag.ContinueOnError)
+	cli  = flag.NewFlagSet("alfred-sublime", flag.ContinueOnError)
 
 	// Candidate paths to `subl` command-line program. We'll open projects
 	// via `subl` because it correctly loads the workspace. Opening a
@@ -155,7 +155,6 @@ func runOpenFolder() {
 
 // Filter configuration in Alfred
 func runConfig() {
-
 	// prevent Alfred from re-ordering results
 	if opts.Query == "" {
 		wf.Configure(aw.SuppressUIDs(true))
@@ -181,6 +180,16 @@ func runConfig() {
 			Icon(iconUpdateOK)
 	}
 
+	wf.NewItem("Rescan Projects").
+		Subtitle("Rebuild cached list of projects").
+		Arg("-rescan", "-force").
+		Valid(true).
+		UID("rescan").
+		Icon(iconReload).
+		// Var("hide_alfred", "false").
+		Var("notification", "Reloading project list…").
+		Var("trigger", "config")
+
 	wf.NewItem("Edit Config File").
 		Subtitle("Edit directories to scan").
 		Valid(true).
@@ -210,20 +219,9 @@ func runConfig() {
 		Arg("-open", forumThreadURL).
 		UID("forum").
 		Valid(true).
-		Icon(iconURL).
+		Icon(iconForum).
 		Var("hide_alfred", "true")
 
-	// TODO: add "back to" setting for rescan command
-	wf.NewItem("Rescan Projects").
-		Subtitle("Rebuild cached list of projects").
-		Arg("-rescan", "-force").
-		Valid(true).
-		UID("rescan").
-		Icon(iconReload).
-		// Var("hide_alfred", "false").
-		Var("notification", "Reloading project list…").
-		Var("trigger", conf.BackToTrigger)
-
 	if opts.Query != "" {
 		wf.Filter(opts.Query)
 		addNavigationItems(opts.Query, "config", "rescan")
@@ -296,10 +294,9 @@ func runSearch() {
 	}
 
 	if len(projs) == 0 && wf.IsRunning("rescan") {
-
 		wf.Rerun(0.1)
 		wf.NewItem("Scanning projects…").
-			Subtitle("Results will refresh in a few seconds").
+			Subtitle("Results will be available shortly").
 			Valid(false).
 			Icon(iconSpinner())
 
@@ -313,13 +310,13 @@ func runSearch() {
 	}
 
 	for _, proj := range projs {
-
 		it := wf.NewItem(proj.Name()).
 			Subtitle(util.PrettyPath(proj.Path)).
 			Valid(true).
 			Arg("-project", "--", proj.Path).
 			UID(proj.Path).
-			IsFile(true).
+			Copytext(proj.Folder()).
+			Action(proj.Folder()).
 			Icon(icon).
 			Var("hide_alfred", "true")
 
@@ -347,10 +344,11 @@ func runSearch() {
 	wf.SendFeedback()
 }
 
-func addNavigationItems(query string, ignore ...string) {
+func addNavigationItems(query, backTo string, ignore ...string) {
 	if len(query) < 3 {
 		return
 	}
+	ignore = append(ignore, backTo)
 	var (
 		items = []struct {
 			keywords []string
@@ -363,6 +361,9 @@ func addNavigationItems(query string, ignore ...string) {
 		}{
 			{
 				[]string{"reload", "rescan"},
+				// Trigger doesn't exist, but we can't put the
+				// real trigger (backTo) here yet because it's
+				// the current action, which we want to filter out
 				"rescan",
 				"Rescan Projects",
 				"Rescan disk & update cached list of projects",
@@ -397,28 +398,30 @@ func addNavigationItems(query string, ignore ...string) {
 			continue
 		}
 		for _, kw := range conf.keywords {
-			if strings.HasPrefix(strings.ToLower(kw), query) {
-				it := wf.NewItem(conf.title).
-					Subtitle(conf.subtitle).
-					Icon(conf.icon).
-					UID("navigation-action."+conf.trigger).
-					Valid(true).
-					Var("trigger", conf.trigger).
-					Var("query", "")
-
-				if conf.trigger == "rescan" {
-					it.Var("trigger", "search")
-				}
+			if !strings.HasPrefix(strings.ToLower(kw), query) {
+				continue
+			}
+			it := wf.NewItem(conf.title).
+				Subtitle(conf.subtitle).
+				Icon(conf.icon).
+				UID("navigation-action."+conf.trigger).
+				Valid(true).
+				Var("trigger", conf.trigger).
+				Var("query", "")
+
+			// override non-existent "rescan" trigger
+			if conf.trigger == "rescan" {
+				it.Var("trigger", backTo)
+			}
 
-				if conf.arg != nil {
-					it.Arg(conf.arg...)
-				}
+			if conf.arg != nil {
+				it.Arg(conf.arg...)
+			}
 
-				if conf.note != "" {
-					it.Var("notification", conf.note)
-				}
-				break
+			if conf.note != "" {
+				it.Var("notification", conf.note)
 			}
+			break
 		}
 	}
 }

config.go

@@ -32,9 +32,6 @@ const (
 	// DefaultLocateInterval is how often to run locate
 	DefaultLocateInterval = 24 * time.Hour
 
-	// DefaultBackToTrigger is what trigger is called after a rescan
-	DefaultBackToTrigger = "config"
-
 	defaultConfig = `# How many directories deep to search by default.
 # 0 = the directory itself
 # 1 = immediate children of the directory
@@ -86,7 +83,6 @@ func init() {
 		FindInterval:   DefaultFindInterval,
 		MDFindInterval: DefaultMDFindInterval,
 		LocateInterval: DefaultLocateInterval,
-		BackToTrigger:  DefaultBackToTrigger,
 	}
 }
 
@@ -96,7 +92,6 @@ type config struct {
 	MDFindInterval time.Duration `toml:"-"`
 	LocateInterval time.Duration `toml:"-"`
 	VSCode         bool          `toml:"-" env:"VSCODE"`
-	BackToTrigger  string        `toml:"-"`
 
 	// From config file
 	Excludes    []string      `toml:"excludes"`
@@ -140,15 +135,10 @@ func loadConfig(path string) (*config, error) {
 		return nil, err
 	}
 
-	// Update depths
+	// Update depths and expand paths
 	if conf.Depth == 0 {
 		conf.Depth = DefaultDepth
 	}
-
-	if conf.BackToTrigger != "config" && conf.BackToTrigger != "search" {
-		conf.BackToTrigger = "config"
-	}
-
 	for _, sp := range conf.SearchPaths {
 		if sp.Depth == 0 {
 			sp.Depth = conf.Depth

go.mod

@@ -1,5 +1,7 @@
 module github.com/deanishe/alfred-sublime-text
 
+go 1.13
+
 require (
 	github.com/BurntSushi/toml v0.3.1
 	github.com/davecgh/go-spew v1.1.1
@@ -9,4 +11,3 @@ require (
 	github.com/yosuke-furukawa/json5 v0.1.1
 )
 
-go 1.13

icons.go

@@ -11,28 +11,26 @@ import (
 
 // Workflow icons
 var (
+	iconError           = &aw.Icon{Value: "icons/error.png"}
+	iconForum           = &aw.Icon{Value: "icons/forum.png"}
 	iconHelp            = &aw.Icon{Value: "icons/help.png"}
 	iconIssue           = &aw.Icon{Value: "icons/issue.png"}
 	iconReload          = &aw.Icon{Value: "icons/reload.png"}
 	iconSettings        = &aw.Icon{Value: "icons/settings.png"}
-	iconURL             = &aw.Icon{Value: "icons/url.png"}
+	iconSublime         = &aw.Icon{Value: "icons/sublime.png"}
 	iconUpdateAvailable = &aw.Icon{Value: "icons/update-available.png"}
 	iconUpdateOK        = &aw.Icon{Value: "icons/update-ok.png"}
-	iconWarning         = &aw.Icon{Value: "icons/warning.png"}
-	iconSublime         = &aw.Icon{Value: "icons/sublime.png"}
 	iconVSCode          = &aw.Icon{Value: "icons/vscode.png"}
-	// iconDocs            = &aw.Icon{Value: "icons/docs.png"}
-	// iconOff             = &aw.Icon{Value: "icons/off.png"}
-	// iconOn              = &aw.Icon{Value: "icons/on.png"}
-	// iconTrash           = &aw.Icon{Value: "icons/trash.png"}
-	spinnerIcons = []*aw.Icon{
+	iconWarning         = &aw.Icon{Value: "icons/warning.png"}
+	spinnerIcons        = []*aw.Icon{
 		{Value: "icons/spinner-1.png"},
 		{Value: "icons/spinner-2.png"},
 		{Value: "icons/spinner-3.png"},
 	}
 )
 
 func init() {
+	aw.IconError = iconError
 	aw.IconWarning = iconWarning
 }