diff --git a/api/api.go b/api/api.go index 14ac180..c6c9fee 100644 --- a/api/api.go +++ b/api/api.go @@ -1,218 +1,218 @@ package api import ( "fmt" "path/filepath" "github.com/atotto/clipboard" "github.com/writeas/web-core/posts" "github.com/writeas/writeas-cli/config" "github.com/writeas/writeas-cli/fileutils" "github.com/writeas/writeas-cli/log" writeas "go.code.as/writeas.v2" cli "gopkg.in/urfave/cli.v1" ) func client(userAgent string, tor bool) *writeas.Client { var client *writeas.Client if tor { client = writeas.NewTorClient(TorPort) } else { if config.IsDev() { client = writeas.NewDevClient() } else { client = writeas.NewClient() } } client.UserAgent = userAgent return client } func NewClient(c *cli.Context, authRequired bool) (*writeas.Client, error) { var client *writeas.Client if config.IsTor(c) { client = writeas.NewTorClient(TorPort) } else { if config.IsDev() { client = writeas.NewDevClient() } else { client = writeas.NewClient() } } client.UserAgent = config.UserAgent(c) // TODO: load user into var shared across the app - u, _ := config.LoadUser(config.UserDataDir()) + u, _ := config.LoadUser(config.UserDataDir(c.App.ExtraInfo()["configDir"])) if u != nil { client.SetToken(u.AccessToken) } else if authRequired { return nil, fmt.Errorf("Not currently logged in. Authenticate with: writeas auth ") } return client, nil } // DoFetch retrieves the Write.as post with the given friendlyID, // optionally via the Tor hidden service. func DoFetch(friendlyID, ua string, tor bool) error { cl := client(ua, tor) p, err := cl.GetPost(friendlyID) if err != nil { return err } if p.Title != "" { fmt.Printf("# %s\n\n", string(p.Title)) } fmt.Printf("%s\n", string(p.Content)) return nil } // DoPost creates a Write.as post, returning an error if it was // unsuccessful. func DoPost(c *cli.Context, post []byte, font string, encrypt, tor, code bool) (*writeas.Post, error) { cl, _ := NewClient(c, false) pp := &writeas.PostParams{ Font: config.GetFont(code, font), Collection: config.Collection(c), } pp.Title, pp.Content = posts.ExtractTitle(string(post)) if lang := config.Language(c, true); lang != "" { pp.Language = &lang } p, err := cl.CreatePost(pp) if err != nil { return nil, fmt.Errorf("Unable to post: %v", err) } var url string if p.Collection != nil { url = p.Collection.URL + p.Slug } else { if tor { url = config.TorBaseURL } else if config.IsDev() { url = config.DevBaseURL } else { url = config.WriteasBaseURL } url += "/" + p.ID // Output URL in requested format if c.Bool("md") { url += ".md" } } if cl.Token() == "" { // Store post locally, since we're not authenticated - AddPost(p.ID, p.Token) + AddPost(c, p.ID, p.Token) } // Copy URL to clipboard err = clipboard.WriteAll(string(url)) if err != nil { log.Errorln("writeas: Didn't copy to clipboard: %s", err) } else { log.Info(c, "Copied to clipboard.") } // Output URL fmt.Printf("%s\n", url) return p, nil } // DoUpdate updates the given post on Write.as. func DoUpdate(c *cli.Context, post []byte, friendlyID, token, font string, tor, code bool) error { cl, _ := NewClient(c, false) params := writeas.PostParams{} params.Title, params.Content = posts.ExtractTitle(string(post)) if lang := config.Language(c, false); lang != "" { params.Language = &lang } if code || font != "" { params.Font = config.GetFont(code, font) } _, err := cl.UpdatePost(friendlyID, token, ¶ms) if err != nil { if config.Debug() { log.ErrorlnQuit("Problem updating: %v", err) } return fmt.Errorf("Post doesn't exist, or bad edit token given.") } if tor { log.Info(c, "Post updated via hidden service.") } else { log.Info(c, "Post updated.") } return nil } // DoDelete deletes the given post on Write.as. func DoDelete(c *cli.Context, friendlyID, token string, tor bool) error { cl, _ := NewClient(c, false) err := cl.DeletePost(friendlyID, token) if err != nil { if config.Debug() { log.ErrorlnQuit("Problem deleting: %v", err) } return fmt.Errorf("Post doesn't exist, or bad edit token given.") } if tor { log.Info(c, "Post deleted from hidden service.") } else { log.Info(c, "Post deleted.") } - removePost(friendlyID) + removePost(c.App.ExtraInfo()["configDir"], friendlyID) return nil } func DoLogIn(c *cli.Context, username, password string) error { cl := client(config.UserAgent(c), config.IsTor(c)) u, err := cl.LogIn(username, password) if err != nil { if config.Debug() { log.ErrorlnQuit("Problem logging in: %v", err) } return err } - err = config.SaveUser(config.UserDataDir(), u) + err = config.SaveUser(config.UserDataDir(c.App.ExtraInfo()["configDir"]), u) if err != nil { return err } - fmt.Printf("Logged in as %s.\n", u.User.Username) + log.Info(c, "Logged in as %s.\n", u.User.Username) return nil } func DoLogOut(c *cli.Context) error { cl, err := NewClient(c, true) if err != nil { return err } err = cl.LogOut() if err != nil { if config.Debug() { log.ErrorlnQuit("Problem logging out: %v", err) } return err } // Delete local user data - err = fileutils.DeleteFile(filepath.Join(config.UserDataDir(), config.UserFile)) + err = fileutils.DeleteFile(filepath.Join(config.UserDataDir(c.App.ExtraInfo()["configDir"]), config.UserFile)) if err != nil { return err } return nil } diff --git a/api/posts.go b/api/posts.go index 3f005f2..68d0ba1 100644 --- a/api/posts.go +++ b/api/posts.go @@ -1,194 +1,194 @@ package api import ( "bufio" "fmt" "io" "io/ioutil" "os" "path/filepath" "strings" "github.com/writeas/writeas-cli/config" "github.com/writeas/writeas-cli/fileutils" "github.com/writeas/writeas-cli/log" writeas "go.code.as/writeas.v2" cli "gopkg.in/urfave/cli.v1" ) const ( postsFile = "posts.psv" separator = `|` ) // Post holds the basic authentication information for a Write.as post. type Post struct { ID string EditToken string } -func AddPost(id, token string) error { - f, err := os.OpenFile(filepath.Join(config.UserDataDir(), postsFile), os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0600) +func AddPost(c *cli.Context, id, token string) error { + f, err := os.OpenFile(filepath.Join(config.UserDataDir(c.App.ExtraInfo()["configDir"]), postsFile), os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0600) if err != nil { return fmt.Errorf("Error creating local posts list: %s", err) } defer f.Close() l := fmt.Sprintf("%s%s%s\n", id, separator, token) if _, err = f.WriteString(l); err != nil { return fmt.Errorf("Error writing to local posts list: %s", err) } return nil } -func TokenFromID(id string) string { - post := fileutils.FindLine(filepath.Join(config.UserDataDir(), postsFile), id) +func TokenFromID(c *cli.Context, id string) string { + post := fileutils.FindLine(filepath.Join(config.UserDataDir(c.App.ExtraInfo()["configDir"]), postsFile), id) if post == "" { return "" } parts := strings.Split(post, separator) if len(parts) < 2 { return "" } return parts[1] } -func removePost(id string) { - fileutils.RemoveLine(filepath.Join(config.UserDataDir(), postsFile), id) +func removePost(path, id string) { + fileutils.RemoveLine(filepath.Join(config.UserDataDir(path), postsFile), id) } -func GetPosts() *[]Post { - lines := fileutils.ReadData(filepath.Join(config.UserDataDir(), postsFile)) +func GetPosts(c *cli.Context) *[]Post { + lines := fileutils.ReadData(filepath.Join(config.UserDataDir(c.App.ExtraInfo()["configDir"]), postsFile)) posts := []Post{} if lines != nil && len(*lines) > 0 { parts := make([]string, 2) for _, l := range *lines { parts = strings.Split(l, separator) if len(parts) < 2 { continue } posts = append(posts, Post{ID: parts[0], EditToken: parts[1]}) } } return &posts } func ComposeNewPost() (string, *[]byte) { f, err := fileutils.TempFile(os.TempDir(), "WApost", "txt") if err != nil { if config.Debug() { panic(err) } else { log.Errorln("Error creating temp file: %s", err) return "", nil } } f.Close() cmd := config.EditPostCmd(f.Name()) if cmd == nil { os.Remove(f.Name()) fmt.Println(config.NoEditorErr) return "", nil } cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr if err := cmd.Start(); err != nil { os.Remove(f.Name()) if config.Debug() { panic(err) } else { log.Errorln("Error starting editor: %s", err) return "", nil } } // If something fails past this point, the temporary post file won't be // removed automatically. Calling function should handle this. if err := cmd.Wait(); err != nil { if config.Debug() { panic(err) } else { log.Errorln("Editor finished with error: %s", err) return "", nil } } post, err := ioutil.ReadFile(f.Name()) if err != nil { if config.Debug() { panic(err) } else { log.Errorln("Error reading post: %s", err) return "", nil } } return f.Name(), &post } func WritePost(postsDir string, p *writeas.Post) error { postFilename := p.ID collDir := "" if p.Collection != nil { postFilename = p.Slug collDir = p.Collection.Alias } postFilename += PostFileExt txtFile := p.Content if p.Title != "" { txtFile = "# " + p.Title + "\n\n" + txtFile } return ioutil.WriteFile(filepath.Join(postsDir, collDir, postFilename), []byte(txtFile), 0644) } func HandlePost(fullPost []byte, c *cli.Context) (*writeas.Post, error) { tor := config.IsTor(c) if c.Int("tor-port") != 0 { TorPort = c.Int("tor-port") } if tor { log.Info(c, "Posting to hidden service...") } else { log.Info(c, "Posting...") } return DoPost(c, fullPost, c.String("font"), false, tor, c.Bool("code")) } func ReadStdIn() []byte { numBytes, numChunks := int64(0), int64(0) r := bufio.NewReader(os.Stdin) fullPost := []byte{} buf := make([]byte, 0, 1024) for { n, err := r.Read(buf[:cap(buf)]) buf = buf[:n] if n == 0 { if err == nil { continue } if err == io.EOF { break } log.ErrorlnQuit("Error reading from stdin: %v", err) } numChunks++ numBytes += int64(len(buf)) fullPost = append(fullPost, buf...) if err != nil && err != io.EOF { log.ErrorlnQuit("Error appending to end of post: %v", err) } } return fullPost } diff --git a/api/sync.go b/api/sync.go index 22c1a01..d687f24 100644 --- a/api/sync.go +++ b/api/sync.go @@ -1,131 +1,131 @@ package api import ( //"github.com/writeas/writeas-cli/sync" "fmt" "io/ioutil" "os" "path/filepath" "github.com/writeas/writeas-cli/config" "github.com/writeas/writeas-cli/fileutils" "github.com/writeas/writeas-cli/log" cli "gopkg.in/urfave/cli.v1" ) const ( PostFileExt = ".txt" userFilename = "writeas_user" ) func CmdPull(c *cli.Context) error { - cfg, err := config.LoadConfig(config.UserDataDir()) + cfg, err := config.LoadConfig(config.UserDataDir(c.App.ExtraInfo()["configDir"])) if err != nil { return err } // Create posts directory if needed if cfg.Posts.Directory == "" { - syncSetUp(cfg) + syncSetUp(c.App.ExtraInfo()["configDir"], cfg) } // Fetch posts cl, err := NewClient(c, true) if err != nil { return err } posts, err := cl.GetUserPosts() if err != nil { return err } for _, p := range *posts { postFilename := p.ID collDir := "" if p.Collection != nil { postFilename = p.Slug // Create directory for collection collDir = p.Collection.Alias if !fileutils.Exists(filepath.Join(cfg.Posts.Directory, collDir)) { log.Info(c, "Creating folder "+collDir) err = os.Mkdir(filepath.Join(cfg.Posts.Directory, collDir), 0755) if err != nil { log.Errorln("Error creating blog directory %s: %s. Skipping post %s.", collDir, err, postFilename) continue } } } postFilename += PostFileExt // Write file txtFile := p.Content if p.Title != "" { txtFile = "# " + p.Title + "\n\n" + txtFile } err = ioutil.WriteFile(filepath.Join(cfg.Posts.Directory, collDir, postFilename), []byte(txtFile), 0644) if err != nil { log.Errorln("Error creating file %s: %s", postFilename, err) } log.Info(c, "Saved post "+postFilename) // Update mtime and atime on files modTime := p.Updated.Local() err = os.Chtimes(filepath.Join(cfg.Posts.Directory, collDir, postFilename), modTime, modTime) if err != nil { log.Errorln("Error setting time on %s: %s", postFilename, err) } } return nil } -func syncSetUp(cfg *config.UserConfig) error { +func syncSetUp(path string, cfg *config.UserConfig) error { // Get user information and fail early (before we make the user do // anything), if we're going to - u, err := config.LoadUser(config.UserDataDir()) + u, err := config.LoadUser(config.UserDataDir(path)) if err != nil { return err } // Prompt for posts directory defaultDir, err := os.Getwd() if err != nil { return err } var dir string fmt.Printf("Posts directory? [%s]: ", defaultDir) fmt.Scanln(&dir) if dir == "" { dir = defaultDir } // FIXME: This only works on non-Windows OSes (fix: https://www.reddit.com/r/golang/comments/5t3ezd/hidden_files_directories/) userFilepath := filepath.Join(dir, "."+userFilename) // Create directory if needed if !fileutils.Exists(dir) { err = os.MkdirAll(dir, 0700) if err != nil { if config.Debug() { log.Errorln("Error creating data directory: %s", err) } return err } // Create username file in directory err = ioutil.WriteFile(userFilepath, []byte(u.User.Username), 0644) fmt.Println("Created posts directory.") } // Save preference cfg.Posts.Directory = dir - err = config.SaveConfig(config.UserDataDir(), cfg) + err = config.SaveConfig(config.UserDataDir(path), cfg) if err != nil { if config.Debug() { log.Errorln("Unable to save config: %s", err) } return err } fmt.Println("Saved config.") return nil } diff --git a/cmd/writeas/config_nix.go b/cmd/writeas/config_nix.go new file mode 100644 index 0000000..6b3cb86 --- /dev/null +++ b/cmd/writeas/config_nix.go @@ -0,0 +1,7 @@ +// +build !windows + +package main + +var appInfo = map[string]string{ + "configDir": ".writeas", +} diff --git a/cmd/writeas/config_win.go b/cmd/writeas/config_win.go new file mode 100644 index 0000000..9a7eea1 --- /dev/null +++ b/cmd/writeas/config_win.go @@ -0,0 +1,7 @@ +// +build windows + +package main + +var appInfo = map[string]string{ + "configDir": "Write.as", +} diff --git a/cmd/writeas/main.go b/cmd/writeas/main.go index cff6657..838e4de 100644 --- a/cmd/writeas/main.go +++ b/cmd/writeas/main.go @@ -1,263 +1,264 @@ package main import ( "os" "github.com/writeas/writeas-cli/api" "github.com/writeas/writeas-cli/commands" "github.com/writeas/writeas-cli/config" "github.com/writeas/writeas-cli/log" cli "gopkg.in/urfave/cli.v1" ) func main() { - initialize() - + initialize(appInfo["configDir"]) cli.VersionFlag = cli.BoolFlag{ Name: "version, V", Usage: "print the version", } // Run the app app := cli.NewApp() app.Name = "writeas" app.Version = config.Version app.Usage = "Publish text quickly" app.Authors = []cli.Author{ { Name: "Write.as", Email: "hello@write.as", }, } + app.ExtraInfo = func() map[string]string { + return appInfo + } app.Action = commands.CmdPost app.Flags = config.PostFlags app.Commands = []cli.Command{ { Name: "post", Usage: "Alias for default action: create post from stdin", Action: commands.CmdPost, Flags: config.PostFlags, Description: `Create a new post on Write.as from stdin. Use the --code flag to indicate that the post should use syntax highlighting. Or use the --font [value] argument to set the post's appearance, where [value] is mono, monospace (default), wrap (monospace font with word wrapping), serif, or sans.`, }, { Name: "new", Usage: "Compose a new post from the command-line and publish", Description: `An alternative to piping data to the program. On Windows, this will use 'copy con' to start reading what you input from the prompt. Press F6 or Ctrl-Z then Enter to end input. On *nix, this will use the best available text editor, starting with the value set to the WRITEAS_EDITOR or EDITOR environment variable, or vim, or finally nano. Use the --code flag to indicate that the post should use syntax highlighting. Or use the --font [value] argument to set the post's appearance, where [value] is mono, monospace (default), wrap (monospace font with word wrapping), serif, or sans. If posting fails for any reason, 'writeas' will show you the temporary file location and how to pipe it to 'writeas' to retry.`, Action: commands.CmdNew, Flags: config.PostFlags, }, { Name: "publish", Usage: "Publish a file to Write.as", Action: commands.CmdPublish, Flags: config.PostFlags, }, { Name: "delete", Usage: "Delete a post", Action: commands.CmdDelete, Flags: []cli.Flag{ cli.BoolFlag{ Name: "tor, t", Usage: "Delete via Tor hidden service", }, cli.IntFlag{ Name: "tor-port", Usage: "Use a different port to connect to Tor", Value: 9150, }, cli.BoolFlag{ Name: "verbose, v", Usage: "Make the operation more talkative", }, }, }, { Name: "update", Usage: "Update (overwrite) a post", Action: commands.CmdUpdate, Flags: []cli.Flag{ cli.BoolFlag{ Name: "tor, t", Usage: "Update via Tor hidden service", }, cli.IntFlag{ Name: "tor-port", Usage: "Use a different port to connect to Tor", Value: 9150, }, cli.BoolFlag{ Name: "code", Usage: "Specifies this post is code", }, cli.StringFlag{ Name: "font", Usage: "Sets post font to given value", }, cli.BoolFlag{ Name: "verbose, v", Usage: "Make the operation more talkative", }, }, }, { Name: "get", Usage: "Read a raw post", Action: commands.CmdGet, Flags: []cli.Flag{ cli.BoolFlag{ Name: "tor, t", Usage: "Get from Tor hidden service", }, cli.IntFlag{ Name: "tor-port", Usage: "Use a different port to connect to Tor", Value: 9150, }, cli.BoolFlag{ Name: "verbose, v", Usage: "Make the operation more talkative", }, }, }, { Name: "add", Usage: "Add an existing post locally", Description: `A way to add an existing post to your local store for easy editing later. This requires a post ID (from https://write.as/[ID]) and an Edit Token (exported from another Write.as client, such as the Android app). `, Action: commands.CmdAdd, }, { Name: "list", Usage: "List local posts", Action: commands.CmdList, Flags: []cli.Flag{ cli.BoolFlag{ Name: "id", Usage: "Show list with post IDs (default)", }, cli.BoolFlag{ Name: "md", Usage: "Use with --url to return URLs with Markdown enabled", }, cli.BoolFlag{ Name: "url", Usage: "Show list with URLs", }, }, }, { Name: "fetch", Usage: "Fetch authenticated user's Write.as posts", Action: api.CmdPull, Flags: []cli.Flag{ cli.BoolFlag{ Name: "tor, t", Usage: "Authenticate via Tor hidden service", }, cli.IntFlag{ Name: "tor-port", Usage: "Use a different port to connect to Tor", Value: 9150, }, cli.BoolFlag{ Name: "verbose, v", Usage: "Make the operation more talkative", }, }, }, { Name: "auth", Usage: "Authenticate with Write.as", Action: commands.CmdAuth, Flags: []cli.Flag{ cli.BoolFlag{ Name: "tor, t", Usage: "Authenticate via Tor hidden service", }, cli.IntFlag{ Name: "tor-port", Usage: "Use a different port to connect to Tor", Value: 9150, }, cli.BoolFlag{ Name: "verbose, v", Usage: "Make the operation more talkative", }, }, }, { Name: "logout", Usage: "Log out of Write.as", Action: commands.CmdLogOut, Flags: []cli.Flag{ cli.BoolFlag{ Name: "tor, t", Usage: "Authenticate via Tor hidden service", }, cli.IntFlag{ Name: "tor-port", Usage: "Use a different port to connect to Tor", Value: 9150, }, cli.BoolFlag{ Name: "verbose, v", Usage: "Make the operation more talkative", }, }, }, } cli.CommandHelpTemplate = `NAME: {{.Name}} - {{.Usage}} USAGE: writeas {{.Name}}{{if .Flags}} [command options]{{end}} [arguments...]{{if .Description}} DESCRIPTION: {{.Description}}{{end}}{{if .Flags}} OPTIONS: {{range .Flags}}{{.}} {{end}}{{ end }} ` - app.Run(os.Args) } -func initialize() { +func initialize(dataDirName string) { // Ensure we have a data directory to use - if !config.DataDirExists() { - err := config.CreateDataDir() + if !config.DataDirExists(dataDirName) { + err := config.CreateDataDir(dataDirName) if err != nil { if config.Debug() { panic(err) } else { log.Errorln("Error creating data directory: %s", err) return } } } } diff --git a/commands/commands.go b/commands/commands.go index fcdec40..dede994 100644 --- a/commands/commands.go +++ b/commands/commands.go @@ -1,250 +1,250 @@ package commands import ( "fmt" "io/ioutil" "os" "path/filepath" "github.com/howeyc/gopass" "github.com/writeas/writeas-cli/api" "github.com/writeas/writeas-cli/config" "github.com/writeas/writeas-cli/fileutils" "github.com/writeas/writeas-cli/log" cli "gopkg.in/urfave/cli.v1" ) func CmdPost(c *cli.Context) error { _, err := api.HandlePost(api.ReadStdIn(), c) return err } func CmdNew(c *cli.Context) error { fname, p := api.ComposeNewPost() if p == nil { // Assume composeNewPost already told us what the error was. Abort now. os.Exit(1) } // Ensure we have something to post if len(*p) == 0 { // Clean up temporary post if fname != "" { os.Remove(fname) } log.InfolnQuit("Empty post. Bye!") } _, err := api.HandlePost(*p, c) if err != nil { log.Errorln("Error posting: %s\n%s", err, config.MessageRetryCompose(fname)) return cli.NewExitError("", 1) } // Clean up temporary post if fname != "" { os.Remove(fname) } return nil } func CmdPublish(c *cli.Context) error { filename := c.Args().Get(0) if filename == "" { return cli.NewExitError("usage: writeas publish ", 1) } content, err := ioutil.ReadFile(filename) if err != nil { return err } p, err := api.HandlePost(content, c) if err != nil { return err } // Save post to posts folder - cfg, err := config.LoadConfig(config.UserDataDir()) + cfg, err := config.LoadConfig(config.UserDataDir(c.App.ExtraInfo()["configDir"])) if cfg.Posts.Directory != "" { err = api.WritePost(cfg.Posts.Directory, p) if err != nil { return err } } return nil } func CmdDelete(c *cli.Context) error { friendlyID := c.Args().Get(0) token := c.Args().Get(1) if friendlyID == "" { return cli.NewExitError("usage: writeas delete []", 1) } - u, _ := config.LoadUser(config.UserDataDir()) + u, _ := config.LoadUser(config.UserDataDir(c.App.ExtraInfo()["configDir"])) if token == "" { // Search for the token locally - token = api.TokenFromID(friendlyID) + token = api.TokenFromID(c, friendlyID) if token == "" && u == nil { log.Errorln("Couldn't find an edit token locally. Did you create this post here?") log.ErrorlnQuit("If you have an edit token, use: writeas delete %s ", friendlyID) } } tor := config.IsTor(c) if c.Int("tor-port") != 0 { api.TorPort = c.Int("tor-port") } if tor { log.Info(c, "Deleting via hidden service...") } else { log.Info(c, "Deleting...") } err := api.DoDelete(c, friendlyID, token, tor) if err != nil { return err } // Delete local file, if necessary - cfg, err := config.LoadConfig(config.UserDataDir()) + cfg, err := config.LoadConfig(config.UserDataDir(c.App.ExtraInfo()["configDir"])) if cfg.Posts.Directory != "" { // TODO: handle deleting blog posts err = fileutils.DeleteFile(filepath.Join(cfg.Posts.Directory, friendlyID+api.PostFileExt)) if err != nil { return err } } return nil } func CmdUpdate(c *cli.Context) error { friendlyID := c.Args().Get(0) token := c.Args().Get(1) if friendlyID == "" { return cli.NewExitError("usage: writeas update []", 1) } - u, _ := config.LoadUser(config.UserDataDir()) + u, _ := config.LoadUser(config.UserDataDir(c.App.ExtraInfo()["configDir"])) if token == "" { // Search for the token locally - token = api.TokenFromID(friendlyID) + token = api.TokenFromID(c, friendlyID) if token == "" && u == nil { log.Errorln("Couldn't find an edit token locally. Did you create this post here?") log.ErrorlnQuit("If you have an edit token, use: writeas update %s ", friendlyID) } } // Read post body fullPost := api.ReadStdIn() tor := config.IsTor(c) if c.Int("tor-port") != 0 { api.TorPort = c.Int("tor-port") } if tor { log.Info(c, "Updating via hidden service...") } else { log.Info(c, "Updating...") } return api.DoUpdate(c, fullPost, friendlyID, token, c.String("font"), tor, c.Bool("code")) } func CmdGet(c *cli.Context) error { friendlyID := c.Args().Get(0) if friendlyID == "" { return cli.NewExitError("usage: writeas get ", 1) } tor := config.IsTor(c) if c.Int("tor-port") != 0 { api.TorPort = c.Int("tor-port") } if tor { log.Info(c, "Getting via hidden service...") } else { log.Info(c, "Getting...") } return api.DoFetch(friendlyID, config.UserAgent(c), tor) } func CmdAdd(c *cli.Context) error { friendlyID := c.Args().Get(0) token := c.Args().Get(1) if friendlyID == "" || token == "" { return cli.NewExitError("usage: writeas add ", 1) } - err := api.AddPost(friendlyID, token) + err := api.AddPost(c, friendlyID, token) return err } func CmdList(c *cli.Context) error { urls := c.Bool("url") ids := c.Bool("id") var p api.Post - posts := api.GetPosts() + posts := api.GetPosts(c) for i := range *posts { p = (*posts)[len(*posts)-1-i] if ids || !urls { fmt.Printf("%s ", p.ID) } if urls { base := config.WriteasBaseURL if config.IsDev() { base = config.DevBaseURL } ext := "" // Output URL in requested format if c.Bool("md") { ext = ".md" } fmt.Printf("%s/%s%s ", base, p.ID, ext) } fmt.Print("\n") } return nil } func CmdAuth(c *cli.Context) error { // Check configuration - u, err := config.LoadUser(config.UserDataDir()) + u, err := config.LoadUser(config.UserDataDir(c.App.ExtraInfo()["configDir"])) if err != nil { return cli.NewExitError(fmt.Sprintf("couldn't load config: %v", err), 1) } if u != nil && u.AccessToken != "" { return cli.NewExitError("You're already authenticated as "+u.User.Username+". Log out with: writeas logout", 1) } // Validate arguments and get password username := c.Args().Get(0) if username == "" { return cli.NewExitError("usage: writeas auth ", 1) } fmt.Print("Password: ") pass, err := gopass.GetPasswdMasked() if err != nil { return cli.NewExitError(fmt.Sprintf("error reading password: %v", err), 1) } // Validate password if len(pass) == 0 { return cli.NewExitError("Please enter your password.", 1) } err = api.DoLogIn(c, username, string(pass)) if err != nil { return cli.NewExitError(fmt.Sprintf("error logging in: %v", err), 1) } return nil } func CmdLogOut(c *cli.Context) error { return api.DoLogOut(c) } diff --git a/config/directories.go b/config/directories.go index 9031489..8373835 100644 --- a/config/directories.go +++ b/config/directories.go @@ -1,20 +1,20 @@ package config import ( "os" "path/filepath" "github.com/writeas/writeas-cli/fileutils" ) -func UserDataDir() string { +func UserDataDir(dataDirName string) string { return filepath.Join(parentDataDir(), dataDirName) } -func DataDirExists() bool { - return fileutils.Exists(UserDataDir()) +func DataDirExists(dataDirName string) bool { + return fileutils.Exists(UserDataDir(dataDirName)) } -func CreateDataDir() error { - return os.Mkdir(UserDataDir(), 0700) +func CreateDataDir(dataDirName string) error { + return os.Mkdir(UserDataDir(dataDirName), 0700) } diff --git a/config/files_nix.go b/config/files_nix.go index 8c669d3..0c10f04 100644 --- a/config/files_nix.go +++ b/config/files_nix.go @@ -1,44 +1,43 @@ // +build !windows package config import ( "fmt" "os/exec" homedir "github.com/mitchellh/go-homedir" ) const ( - dataDirName = ".writeas" NoEditorErr = "Couldn't find default editor. Try setting $EDITOR environment variable in ~/.profile" ) func parentDataDir() string { dir, err := homedir.Dir() if err != nil { panic(err) } return dir } func EditPostCmd(fname string) *exec.Cmd { editor := GetConfiguredEditor() if editor == "" { // Fall back to default editor path, err := exec.LookPath("vim") if err != nil { path, err = exec.LookPath("nano") if err != nil { return nil } } editor = path } return exec.Command(editor, fname) } func MessageRetryCompose(fname string) string { return fmt.Sprintf("To retry this post, run:\n cat %s | writeas", fname) } diff --git a/config/files_win.go b/config/files_win.go index cf478f1..026b803 100644 --- a/config/files_win.go +++ b/config/files_win.go @@ -1,27 +1,26 @@ // +build windows package config import ( "fmt" "os" "os/exec" ) const ( - dataDirName = "Write.as" NoEditorErr = "Error getting default editor. You shouldn't see this, so let us know you did: hello@write.as" ) func parentDataDir() string { return os.Getenv("APPDATA") } func EditPostCmd(fname string) *exec.Cmd { // NOTE this won't work if fname contains spaces. return exec.Command("cmd", "/C copy con "+fname) } func MessageRetryCompose(fname string) string { return fmt.Sprintf("To retry this post, run:\n type %s | writeas.exe", fname) }