diff --git a/cmd/writeas/commands.go b/cmd/writeas/commands.go index a2d0eb1..31dfe23 100644 --- a/cmd/writeas/commands.go +++ b/cmd/writeas/commands.go @@ -1,243 +1,249 @@ package main import ( "fmt" "io/ioutil" "os" "path/filepath" "github.com/howeyc/gopass" "github.com/writeas/writeas-cli/fileutils" cli "gopkg.in/urfave/cli.v1" ) func cmdPost(c *cli.Context) error { _, err := handlePost(readStdIn(), c) return err } func cmdNew(c *cli.Context) error { fname, p := 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) } InfolnQuit("Empty post. Bye!") } _, err := handlePost(*p, c) if err != nil { Errorln("Error posting: %s", err) Errorln(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 := handlePost(content, c) if err != nil { return err } // Save post to posts folder cfg, err := loadConfig() if cfg.Posts.Directory != "" { err = 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, _ := loadUser() if token == "" { // Search for the token locally token = tokenFromID(friendlyID) if token == "" && u == nil { Errorln("Couldn't find an edit token locally. Did you create this post here?") ErrorlnQuit("If you have an edit token, use: writeas delete %s ", friendlyID) } } tor := isTor(c) if c.Int("tor-port") != 0 { torPort = c.Int("tor-port") } if tor { Info(c, "Deleting via hidden service...") + } else if isDev() { + Info(c, "Deleting via dev environment...") } else { Info(c, "Deleting...") } err := DoDelete(c, friendlyID, token, tor) if err != nil { return err } // Delete local file, if necessary cfg, err := loadConfig() if cfg.Posts.Directory != "" { // TODO: handle deleting blog posts err = fileutils.DeleteFile(filepath.Join(cfg.Posts.Directory, friendlyID+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, _ := loadUser() if token == "" { // Search for the token locally token = tokenFromID(friendlyID) if token == "" && u == nil { Errorln("Couldn't find an edit token locally. Did you create this post here?") ErrorlnQuit("If you have an edit token, use: writeas update %s ", friendlyID) } } // Read post body fullPost := readStdIn() tor := isTor(c) if c.Int("tor-port") != 0 { torPort = c.Int("tor-port") } if tor { Info(c, "Updating via hidden service...") + } else if isDev() { + Info(c, "Updating via dev environment...") } else { Info(c, "Updating...") } return 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 := isTor(c) if c.Int("tor-port") != 0 { torPort = c.Int("tor-port") } if tor { Info(c, "Getting via hidden service...") + } else if isDev() { + Info(c, "Getting via dev environment...") } else { Info(c, "Getting...") } return DoFetch(friendlyID, 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 := addPost(friendlyID, token) return err } func cmdList(c *cli.Context) error { urls := c.Bool("url") ids := c.Bool("id") var p Post posts := getPosts() for i := range *posts { p = (*posts)[len(*posts)-1-i] if ids || !urls { fmt.Printf("%s ", p.ID) } if urls { base := writeasBaseURL if isDev() { base = 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 := loadUser() 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) } return DoLogIn(c, username, string(pass)) } func cmdLogOut(c *cli.Context) error { return DoLogOut(c) }