Use Browsh-specific FF profile.

Also adds `-debug` flag.
browsh-org · Feb 3, 2018 · c0e51e6 · c0e51e6
1 parent 3b7ee79
commit c0e51e6
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 7 deletions.
diff --git a/interfacer/Gopkg.lock b/interfacer/Gopkg.lock
diff --git a/interfacer/Gopkg.toml b/interfacer/Gopkg.toml
@@ -9,3 +9,7 @@
 [[constraint]]
   name = "github.com/shuLhan/go-bindata"
   version = "3.2.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/shibukawa/configdir"
diff --git a/interfacer/main.go b/interfacer/main.go
@@ -21,6 +21,8 @@ import (
 	"github.com/nsf/termbox-go"
 
 	"github.com/gorilla/websocket"
+	"github.com/shibukawa/configdir"
+
 )
 
 var (
@@ -30,6 +32,7 @@ var (
 	isFFGui              = flag.Bool("with-gui", false, "Don't use headless Firefox")
 	isUseExistingFirefox = flag.Bool("use-existing-ff", false, "Whether Browsh should launch Firefox or not")
 	useFFProfile         = flag.String("ff-profile", "default", "Firefox profile to use")
+	isDebug              = flag.Bool("debug", false, "Log to ./debug.log")
 	upgrader             = websocket.Upgrader{
 		CheckOrigin:     func(r *http.Request) bool { return true },
 		ReadBufferSize:  1024,
@@ -85,6 +88,9 @@ func setupLogging() {
 }
 
 func log(msg string) {
+	if !*isDebug {
+		return
+	}
 	f, oErr := os.OpenFile(logfile, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0600)
 	if oErr != nil {
 		shutdown(oErr.Error())
@@ -272,6 +278,14 @@ func webSocketServer(w http.ResponseWriter, r *http.Request) {
 	sendTtySize()
 }
 
+// Gets a cross-platform path to store Browsh config
+func getConfigFolder() string {
+	configDirs := configdir.New("browsh", "firefox_profile")
+	folders := configDirs.QueryFolders(configdir.Global)
+	folders[0].MkdirAll()
+	return folders[0].Path
+}
+
 func startHeadlessFirefox() {
 	println("Starting...")
 	log("Starting Firefox in headless mode")
@@ -280,7 +294,12 @@ func startHeadlessFirefox() {
 		args = append(args, "--headless")
 	}
 	if *useFFProfile != "default" {
+		log("Using profile: " + *useFFProfile)
 		args = append(args, "-P", *useFFProfile)
+	} else {
+		profilePath := getConfigFolder()
+		log("Using default profile at: " + profilePath)
+		args = append(args, "--profile", profilePath)
 	}
 	firefoxProcess := exec.Command(*firefoxBinary, args...)
 	defer firefoxProcess.Process.Kill()

diff --git a/webext/dist/manifest.json b/webext/dist/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Browsh",
-  "version": "0.2.5",
+  "version": "0.2.6",
 
   "description": "Renders the browser as realtime, interactive, TTY-compatible text",
 

diff --git a/webext/manifest.json b/webext/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Browsh",
-  "version": "0.2.5",
+  "version": "0.2.6",
 
   "description": "Renders the browser as realtime, interactive, TTY-compatible text",
 

diff --git a/webext/test/integration/helper.js b/webext/test/integration/helper.js
@@ -63,7 +63,7 @@ class Helper {
       env: process.env
     });
     this.browshPTY.write(`cd ${dir} \r`);
-    this.browshPTY.write(`go run *.go -use-existing-ff \r`);
+    this.browshPTY.write(`go run *.go -use-existing-ff -debug \r`);
     this.broadcastOutput();
   }