No OneTemporary
Actions

Size

17 KB

Subscribers

None

View Options

	diff --git a/cmd/writeas/api.go b/cmd/writeas/api.go
	index d60c1f2..bd9b3d7 100644
	--- a/cmd/writeas/api.go
	+++ b/cmd/writeas/api.go
	@@ -1,209 +1,219 @@
	package main

	import (
	"fmt"
	"github.com/atotto/clipboard"
	"github.com/writeas/go-writeas"
	"github.com/writeas/writeas-cli/fileutils"
	"gopkg.in/urfave/cli.v1"
	"path/filepath"
	)

	const (
	defaultUserAgent = "writeas-cli v" + version
	)

	func client(userAgent string, tor bool) *writeas.Client {
	var client *writeas.Client
	if tor {
	client = writeas.NewTorClient(torPort)
	} else {
	- client = writeas.NewClient()
	+ if 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 isTor(c) {
	client = writeas.NewTorClient(torPort)
	} else {
	- client = writeas.NewClient()
	+ if isDev() {
	+ client = writeas.NewDevClient()
	+ } else {
	+ client = writeas.NewClient()
	+ }
	}
	client.UserAgent = userAgent(c)
	// TODO: load user into var shared across the app
	u, _ := loadUser()
	if u != nil {
	client.SetToken(u.AccessToken)
	} else if authRequired {
	return nil, fmt.Errorf("Not currently logged in. Authenticate with: writeas auth -u <username>")
	}

	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{
	// TODO: extract title
	Content: string(post),
	Font: getFont(code, font),
	Collection: collection(c),
	}
	if lang := language(c); 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 = torBaseURL
	+ } else if isDev() {
	+ url = devBaseURL
	} else {
	url = writeasBaseURL
	}
	url += "/" + p.ID
	}

	if cl.Token() == "" {
	// Store post locally, since we're not authenticated
	addPost(p.ID, p.Token)
	}

	// Copy URL to clipboard
	err = clipboard.WriteAll(string(url))
	if err != nil {
	Errorln("writeas: Didn't copy to clipboard: %s", err)
	} else {
	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{
	ID: friendlyID,
	Token: token,
	Content: string(post),
	// TODO: extract title
	}
	if code \|\| font != "" {
	params.Font = getFont(code, font)
	}

	_, err := cl.UpdatePost(&params)
	if err != nil {
	if debug {
	ErrorlnQuit("Problem updating: %v", err)
	}
	return fmt.Errorf("Post doesn't exist, or bad edit token given.")
	}

	if tor {
	Info(c, "Post updated via hidden service.")
	} else {
	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(&writeas.PostParams{
	ID: friendlyID,
	Token: token,
	})
	if err != nil {
	if debug {
	ErrorlnQuit("Problem deleting: %v", err)
	}
	return fmt.Errorf("Post doesn't exist, or bad edit token given.")
	}

	if tor {
	Info(c, "Post deleted from hidden service.")
	} else {
	Info(c, "Post deleted.")
	}
	removePost(friendlyID)

	return nil
	}

	func DoLogIn(c *cli.Context, username, password string) error {
	cl := client(userAgent(c), isTor(c))

	u, err := cl.LogIn(username, password)
	if err != nil {
	if debug {
	ErrorlnQuit("Problem logging in: %v", err)
	}
	return err
	}

	err = saveUser(u)
	if err != nil {
	return err
	}
	fmt.Printf("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 debug {
	ErrorlnQuit("Problem logging out: %v", err)
	}
	return err
	}

	// Delete local user data
	err = fileutils.DeleteFile(filepath.Join(userDataDir(), userFile))
	if err != nil {
	return err
	}

	return nil
	}
	diff --git a/cmd/writeas/cli.go b/cmd/writeas/cli.go
	index 2280d3b..cdd2fdc 100644
	--- a/cmd/writeas/cli.go
	+++ b/cmd/writeas/cli.go
	@@ -1,331 +1,332 @@
	package main

	import (
	"bufio"
	"github.com/writeas/go-writeas"
	"gopkg.in/urfave/cli.v1"
	"io"
	"log"
	"os"
	)

	// API constants for communicating with Write.as.
	const (
	writeasBaseURL = "https://write.as"
	+ devBaseURL = "https://development.write.as"
	torBaseURL = "http://writeas7pm7rcdqg.onion"
	)

	// Application constants.
	const (
	version = "1.1"
	)

	// Defaults for posts on Write.as.
	const (
	defaultFont = PostFontMono
	)

	// Available flags for creating posts
	var postFlags = []cli.Flag{
	cli.StringFlag{
	Name: "c, b",
	Usage: "Optional blog to post to",
	Value: "",
	},
	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,
	},
	cli.StringFlag{
	Name: "lang",
	Usage: "Sets post language to given ISO 639-1 language code",
	Value: "",
	},
	cli.StringFlag{
	Name: "user-agent",
	Usage: "Sets the User-Agent for API requests",
	Value: "",
	},
	}

	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: "publish",
	Usage: "Publish a file to Write.as",
	Action: cmdPublish,
	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",
	},
	},
	},
	{
	Name: "fetch",
	Usage: "Fetch authenticated user's Write.as posts",
	Action: 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,
	},
	},
	},
	{
	Name: "auth",
	Usage: "Authenticate with Write.as",
	Action: 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.StringFlag{
	Name: "u",
	Usage: "Username for authentication",
	Value: "",
	},
	},
	},
	{
	Name: "logout",
	Usage: "Log out of Write.as",
	Action: 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.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) (writeas.Post, error) {
	tor := isTor(c)
	if c.Int("tor-port") != 0 {
	torPort = c.Int("tor-port")
	}
	if tor {
	Info(c, "Posting to hidden service...")
	} else {
	Info(c, "Posting...")
	}

	return DoPost(c, fullPost, c.String("font"), false, tor, c.Bool("code"))
	}
	diff --git a/cmd/writeas/commands.go b/cmd/writeas/commands.go
	index fd9339a..3195b46 100644
	--- a/cmd/writeas/commands.go
	+++ b/cmd/writeas/commands.go
	@@ -1,233 +1,237 @@
	package main

	import (
	"fmt"
	"github.com/howeyc/gopass"
	"github.com/writeas/writeas-cli/fileutils"
	"gopkg.in/urfave/cli.v1"
	"io/ioutil"
	"os"
	"path/filepath"
	)

	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 <filename>", 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 <postId> [<token>]", 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 <token>", friendlyID)
	}
	}

	tor := isTor(c)
	if c.Int("tor-port") != 0 {
	torPort = c.Int("tor-port")
	}
	if tor {
	Info(c, "Deleting via hidden service...")
	} 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 <postId> [<token>]", 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 <token>", 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 {
	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 <postId>", 1)
	}

	tor := isTor(c)
	if c.Int("tor-port") != 0 {
	torPort = c.Int("tor-port")
	}
	if tor {
	Info(c, "Getting via hidden service...")
	} 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 <postId> <token>", 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)
	+ base := writeasBaseURL
	+ if isDev() {
	+ base = devBaseURL
	+ }
	+ fmt.Printf("%s/%s ", base, p.ID)
	}
	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.", 1)
	}

	// Validate arguments and get password
	username := c.String("u")
	if username == "" {
	return cli.NewExitError("usage: writeas auth -u <username>", 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)
	}
	diff --git a/cmd/writeas/dev.go b/cmd/writeas/dev.go
	new file mode 100644
	index 0000000..a290838
	--- /dev/null
	+++ b/cmd/writeas/dev.go
	@@ -0,0 +1,9 @@
	+package main
	+
	+import (
	+ "os"
	+)
	+
	+func isDev() bool {
	+ return os.Getenv("WRITEAS_DEV") == "1"
	+}

File Metadata

Mime Type: text/x-diff
Expires: Tue, Feb 10, 8:33 PM (9 h, 48 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 3623282

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions