diff --git a/cmd/writeas/cli.go b/cmd/writeas/cli.go index ea75b0b..51583be 100644 --- a/cmd/writeas/cli.go +++ b/cmd/writeas/cli.go @@ -1,436 +1,441 @@ package main import ( "bufio" "bytes" "fmt" "github.com/atotto/clipboard" "gopkg.in/urfave/cli.v1" "io" "io/ioutil" "log" "net/http" "net/url" "os" "strconv" "strings" ) // API constants for communicating with Write.as. const ( apiURL = "https://write.as" hiddenAPIURL = "http://writeas7pm7rcdqg.onion" readAPIURL = "https://write.as" ) // Application constants. const ( version = "0.4" ) // Defaults for posts on Write.as. const ( defaultFont = PostFontMono ) // Available flags for creating posts var postFlags = []cli.Flag{ cli.BoolFlag{ Name: "tor, t", Usage: "Perform action on 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.BoolFlag{ + Name: "verbose, v", + Usage: "Make the operation more talkative", + }, cli.StringFlag{ Name: "font", Usage: "Sets post font to given value", Value: defaultFont, }, } func main() { initialize() cli.VersionFlag = cli.BoolFlag{ Name: "version, V", Usage: "print the version", } // Run the app app := cli.NewApp() app.Name = "writeas" app.Version = version app.Usage = "Publish text quickly" app.Authors = []cli.Author{ { Name: "Write.as", Email: "hello@write.as", }, } app.Action = cmdPost app.Flags = postFlags app.Commands = []cli.Command{ { Name: "post", Usage: "Alias for default action: create post from stdin", Action: cmdPost, Flags: 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 WRITAS_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: cmdNew, Flags: postFlags, }, { Name: "delete", Usage: "Delete a post", Action: 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, }, }, }, { Name: "update", Usage: "Update (overwrite) a post", Action: 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", }, }, }, { Name: "get", Usage: "Read a raw post", Action: 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, }, }, }, { 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: cmdAdd, }, { Name: "list", Usage: "List local posts", Action: cmdList, Flags: []cli.Flag{ cli.BoolFlag{ Name: "id", Usage: "Show list with post IDs (default)", }, cli.BoolFlag{ Name: "url", Usage: "Show list with URLs", }, }, }, } 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() { // Ensure we have a data directory to use if !dataDirExists() { createDataDir() } } 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.Fatal(err) } numChunks++ numBytes += int64(len(buf)) fullPost = append(fullPost, buf...) if err != nil && err != io.EOF { log.Fatal(err) } } return fullPost } func handlePost(fullPost []byte, c *cli.Context) error { tor := c.Bool("tor") || c.Bool("t") if c.Int("tor-port") != 0 { torPort = c.Int("tor-port") } if tor { - fmt.Println("Posting to hidden service...") + Info(c, "Posting to hidden service...") } else { - fmt.Println("Posting...") + Info(c, "Posting...") } - return DoPost(fullPost, c.String("font"), false, tor, c.Bool("code")) + return DoPost(c, fullPost, c.String("font"), false, tor, c.Bool("code")) } func client(read, tor bool, path, query string) (string, *http.Client) { var u *url.URL var client *http.Client if tor { u, _ = url.ParseRequestURI(hiddenAPIURL) u.Path = "/api/" + path client = torClient() } else { u, _ = url.ParseRequestURI(apiURL) u.Path = "/api/" + path client = &http.Client{} } if query != "" { u.RawQuery = query } urlStr := fmt.Sprintf("%v", u) return urlStr, client } // DoFetch retrieves the Write.as post with the given friendlyID, // optionally via the Tor hidden service. func DoFetch(friendlyID string, tor bool) error { path := friendlyID urlStr, client := client(true, tor, path, "") r, _ := http.NewRequest("GET", urlStr, nil) r.Header.Add("User-Agent", "writeas-cli v"+version) resp, err := client.Do(r) if err != nil { return err } defer resp.Body.Close() if resp.StatusCode == http.StatusOK { content, err := ioutil.ReadAll(resp.Body) if err != nil { return err } fmt.Printf("%s\n", string(content)) } else if resp.StatusCode == http.StatusNotFound { return ErrPostNotFound + } else if resp.StatusCode == http.StatusGone { } else { - return fmt.Errorf("Unable to get post: %s\n", resp.Status) + return fmt.Errorf("Unable to get post: %s", resp.Status) } return nil } // DoPost creates a Write.as post, returning an error if it was // unsuccessful. -func DoPost(post []byte, font string, encrypt, tor, code bool) error { +func DoPost(c *cli.Context, post []byte, font string, encrypt, tor, code bool) error { data := url.Values{} data.Set("w", string(post)) if encrypt { data.Add("e", "") } data.Add("font", getFont(code, font)) urlStr, client := client(false, tor, "", "") r, _ := http.NewRequest("POST", urlStr, bytes.NewBufferString(data.Encode())) r.Header.Add("User-Agent", "writeas-cli v"+version) r.Header.Add("Content-Type", "application/x-www-form-urlencoded") r.Header.Add("Content-Length", strconv.Itoa(len(data.Encode()))) resp, err := client.Do(r) if err != nil { return err } defer resp.Body.Close() if resp.StatusCode == http.StatusOK { content, err := ioutil.ReadAll(resp.Body) if err != nil { return err } nlPos := strings.Index(string(content), "\n") url := content[:nlPos] idPos := strings.LastIndex(string(url), "/") + 1 id := string(url[idPos:]) token := string(content[nlPos+1 : len(content)-1]) addPost(id, token) // Copy URL to clipboard err = clipboard.WriteAll(string(url)) if err != nil { - fmt.Fprintf(os.Stderr, "writeas: Didn't copy to clipboard: %s\n", err) + Errorln("writeas: Didn't copy to clipboard: %s", err) } else { - fmt.Println("Copied to clipboard.") + Info(c, "Copied to clipboard.") } // Output URL fmt.Printf("%s\n", url) } else { return fmt.Errorf("Unable to post: %s", resp.Status) } return nil } // DoUpdate updates the given post on Write.as. -func DoUpdate(post []byte, friendlyID, token, font string, tor, code bool) error { +func DoUpdate(c *cli.Context, post []byte, friendlyID, token, font string, tor, code bool) error { urlStr, client := client(false, tor, friendlyID, fmt.Sprintf("t=%s", token)) data := url.Values{} data.Set("w", string(post)) if code || font != "" { // Only update font if explicitly changed data.Add("font", getFont(code, font)) } r, _ := http.NewRequest("POST", urlStr, bytes.NewBufferString(data.Encode())) r.Header.Add("User-Agent", "writeas-cli v"+version) r.Header.Add("Content-Type", "application/x-www-form-urlencoded") r.Header.Add("Content-Length", strconv.Itoa(len(data.Encode()))) resp, err := client.Do(r) if err != nil { return err } defer resp.Body.Close() if resp.StatusCode == http.StatusOK { if tor { - fmt.Println("Post updated via hidden service.") + Info(c, "Post updated via hidden service.") } else { - fmt.Println("Post updated.") + Info(c, "Post updated.") } } else { if debug { - fmt.Printf("Problem updating: %s\n", resp.Status) + ErrorlnQuit("Problem updating: %s", resp.Status) } else { - return fmt.Errorf("Post doesn't exist, or bad edit token given.\n") + return fmt.Errorf("Post doesn't exist, or bad edit token given.") } } return nil } // DoDelete deletes the given post on Write.as. -func DoDelete(friendlyID, token string, tor bool) error { +func DoDelete(c *cli.Context, friendlyID, token string, tor bool) error { urlStr, client := client(false, tor, friendlyID, fmt.Sprintf("t=%s", token)) r, _ := http.NewRequest("DELETE", urlStr, nil) r.Header.Add("User-Agent", "writeas-cli v"+version) r.Header.Add("Content-Type", "application/x-www-form-urlencoded") resp, err := client.Do(r) if err != nil { return err } defer resp.Body.Close() if resp.StatusCode == http.StatusOK { if tor { - fmt.Println("Post deleted from hidden service.") + Info(c, "Post deleted from hidden service.") } else { - fmt.Println("Post deleted.") + Info(c, "Post deleted.") } removePost(friendlyID) } else { if debug { - fmt.Printf("Problem deleting: %s\n", resp.Status) + ErrorlnQuit("Problem deleting: %s", resp.Status) } else { - return fmt.Errorf("Post doesn't exist, or bad edit token given.\n") + return fmt.Errorf("Post doesn't exist, or bad edit token given.") } } return nil } diff --git a/cmd/writeas/commands.go b/cmd/writeas/commands.go index aa6737a..90b09b0 100644 --- a/cmd/writeas/commands.go +++ b/cmd/writeas/commands.go @@ -1,157 +1,154 @@ package main import ( "fmt" "gopkg.in/urfave/cli.v1" "os" ) 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) } - fmt.Println("Empty post. Bye!") - os.Exit(0) + InfolnQuit("Empty post. Bye!") } err := handlePost(*p, c) if err != nil { - fmt.Fprintf(os.Stderr, "Error posting: %s\n", err) - fmt.Fprintf(os.Stderr, messageRetryCompose(fname)) + Errorln("Error posting: %s", err) + Errorln(messageRetryCompose(fname)) return cli.NewExitError("", 1) } // Clean up temporary post if fname != "" { os.Remove(fname) } 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) } if token == "" { // Search for the token locally token = tokenFromID(friendlyID) if token == "" { - fmt.Println("Couldn't find an edit token locally. Did you create this post here?") - fmt.Printf("If you have an edit token, use: writeas delete %s \n", friendlyID) - os.Exit(1) + 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 := c.Bool("tor") || c.Bool("t") if c.Int("tor-port") != 0 { torPort = c.Int("tor-port") } if tor { - fmt.Println("Deleting via hidden service...") + Info(c, "Deleting via hidden service...") } else { - fmt.Println("Deleting...") + Info(c, "Deleting...") } - return DoDelete(friendlyID, token, tor) + return DoDelete(c, friendlyID, token, tor) } 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) } if token == "" { // Search for the token locally token = tokenFromID(friendlyID) if token == "" { - fmt.Println("Couldn't find an edit token locally. Did you create this post here?") - fmt.Printf("If you have an edit token, use: writeas update %s \n", friendlyID) - os.Exit(1) + 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 := c.Bool("tor") || c.Bool("t") if c.Int("tor-port") != 0 { torPort = c.Int("tor-port") } if tor { - fmt.Println("Updating via hidden service...") + Info(c, "Updating via hidden service...") } else { - fmt.Println("Updating...") + Info(c, "Updating...") } - return DoUpdate(fullPost, friendlyID, token, c.String("font"), tor, c.Bool("code")) + 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 := c.Bool("tor") || c.Bool("t") if c.Int("tor-port") != 0 { torPort = c.Int("tor-port") } if tor { - fmt.Println("Getting via hidden service...") + Info(c, "Getting via hidden service...") } else { - fmt.Println("Getting...") + Info(c, "Getting...") } return DoFetch(friendlyID, 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 { fmt.Printf("https://write.as/%s ", p.ID) } fmt.Print("\n") } return nil } diff --git a/cmd/writeas/logging.go b/cmd/writeas/logging.go new file mode 100644 index 0000000..98fb5ec --- /dev/null +++ b/cmd/writeas/logging.go @@ -0,0 +1,32 @@ +package main + +import ( + "fmt" + "gopkg.in/urfave/cli.v1" + "os" +) + +// Info logs general diagnostic messages, shown only when the -v or --verbose +// flag is provided. +func Info(c *cli.Context, s string, p ...interface{}) { + if c.Bool("v") || c.Bool("verbose") { + fmt.Fprintf(os.Stderr, s+"\n", p...) + } +} + +// InfolnQuit logs the message to stderr and exits normally (without an error). +func InfolnQuit(s string, p ...interface{}) { + fmt.Fprintf(os.Stderr, s+"\n", p...) + os.Exit(0) +} + +// Error +func Errorln(s string, p ...interface{}) { + fmt.Fprintf(os.Stderr, s+"\n", p...) +} + +// ErrorlnQuit logs the message to stderr and exits with an error code. +func ErrorlnQuit(s string, p ...interface{}) { + fmt.Fprintf(os.Stderr, s+"\n", p...) + os.Exit(1) +} diff --git a/cmd/writeas/posts.go b/cmd/writeas/posts.go index 8efbf00..60f72bf 100644 --- a/cmd/writeas/posts.go +++ b/cmd/writeas/posts.go @@ -1,148 +1,148 @@ package main import ( "fmt" "github.com/writeas/writeas-cli/utils" "io/ioutil" "os" "path/filepath" "strings" ) const ( postsFile = "posts.psv" separator = `|` ) // Post holds the basic authentication information for a Write.as post. type Post struct { ID string EditToken string } func userDataDir() string { return filepath.Join(parentDataDir(), dataDirName) } func dataDirExists() bool { return fileutils.Exists(userDataDir()) } func createDataDir() { err := os.Mkdir(userDataDir(), 0700) if err != nil { if debug { panic(err) } else { - fmt.Printf("Error creating data directory: %s\n", err) + Errorln("Error creating data directory: %s", err) return } } } func addPost(id, token string) error { f, err := os.OpenFile(filepath.Join(userDataDir(), postsFile), os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0600) if err != nil { - return fmt.Errorf("Error creating local posts list: %s\n", err) + 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\n", err) + return fmt.Errorf("Error writing to local posts list: %s", err) } return nil } func tokenFromID(id string) string { post := fileutils.FindLine(filepath.Join(userDataDir(), 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(userDataDir(), postsFile), id) } func getPosts() *[]Post { lines := fileutils.ReadData(filepath.Join(userDataDir(), 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 debug { panic(err) } else { - fmt.Printf("Error creating temp file: %s\n", err) + Errorln("Error creating temp file: %s", err) return "", nil } } f.Close() cmd := editPostCmd(f.Name()) if cmd == nil { os.Remove(f.Name()) fmt.Println(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 debug { panic(err) } else { - fmt.Printf("Error starting editor: %s\n", err) + 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 debug { panic(err) } else { - fmt.Printf("Editor finished with error: %s\n", err) + Errorln("Editor finished with error: %s", err) return "", nil } } post, err := ioutil.ReadFile(f.Name()) if err != nil { if debug { panic(err) } else { - fmt.Printf("Error reading post: %s\n", err) + Errorln("Error reading post: %s", err) return "", nil } } return f.Name(), &post }