No OneTemporary
Actions

Size

58 KB

Subscribers

None

View Options

	diff --git a/GUIDE.md b/GUIDE.md
	index 67667df..081607b 100644
	--- a/GUIDE.md
	+++ b/GUIDE.md
	@@ -1,119 +1,124 @@
	# Write.as CLI User Guide

	The Write.as Command-Line Interface (CLI) is a cross-platform tool for publishing text to [Write.as](https://write.as) and its other sites, like [Paste.as](https://paste.as). It is designed to be simple, scriptable, do one job (publishing) well, and work as you'd expect with other command-line tools.

	Write.as is a text-publishing service that protects your privacy. There's no sign up required to publish, but if you do sign up, you can access posts across devices and compile collections of them in what most people would call a "blog".

	Note accounts are not supported in CLI v1.0. They'll be available in [v2.0](https://github.com/writeas/writeas-cli/milestone/4).

	## Uses

	These are a few common uses for `writeas`. If you get stuck or want to know more, run `writeas [command] --help`. If you still have questions, [ask us](https://write.as/contact).

	### Overview

	```
	writeas [global options] command [command options] [arguments...]

	COMMANDS:
	post Alias for default action: create post from stdin
	new Compose a new post from the command-line and publish
	publish Publish a file to Write.as
	delete Delete a post
	update Update (overwrite) a post
	get Read a raw post
	add Add an existing post locally
	posts List all of your posts
	blogs List blogs
	+ claim Claim local unsynced posts
	auth Authenticate with Write.as
	logout Log out of Write.as
	help, h Shows a list of commands or help for one command

	GLOBAL OPTIONS:
	- -c value, -b value Optional blog to post to
	- --tor, -t Perform action on Tor hidden service
	- --tor-port value Use a different port to connect to Tor (default: 9150)
	- --code Specifies this post is code
	- --md Returns post URL with Markdown enabled
	- --verbose, -v Make the operation more talkative
	- --font value Sets post font to given value (default: "mono")
	- --lang value Sets post language to given ISO 639-1 language code
	- --user-agent value Sets the User-Agent for API requests
	- --help, -h show help
	- --version, -V print the version
	+ -c value, -b value Optional blog to post to
	+ --tor, -t Perform action on Tor hidden service
	+ --tor-port value Use a different port to connect to Tor (default: 9150)
	+ --code Specifies this post is code
	+ --md Returns post URL with Markdown enabled
	+ --verbose, -v Make the operation more talkative
	+ --font value Sets post font to given value (default: "mono")
	+ --lang value Sets post language to given ISO 639-1 language code
	+ --user-agent value Sets the User-Agent for API requests
	+ --host value, -H value Operate against a custom hostname
	+ --user value, -u value Use authenticated user, other than default
	+ --help, -h show help
	+ --version, -V print the version
	```

	+> Note: the host and user flags are only available in `wf` the community edition
	+
	#### Share something

	By default, `writeas` creates a post with a `monospace` typeface that doesn't word wrap (scrolls horizontally). It will return a single line with a URL, and automatically copy that URL to the clipboard:

	```bash
	$ echo "Hello world!" \| writeas
	https://write.as/aaaazzzzzzzza
	```

	This is generally more useful for posting terminal output or code, like so (the `--code` flag turns on syntax highlighting):

	macOS / Linux: `cat writeas/cli.go \| writeas --code`

	Windows: `type writeas/cli.go \| writeas.exe --code`

	#### Output a post

	This outputs any Write.as post with the given ID.

	```bash
	$ writeas get aaaazzzzzzzza
	Hello world!
	```

	#### List all published posts

	This lists all posts you've published from your device, as well as any published by the authenticated user.

	Pass the `--url` flag to show the list with full post URLs, and the `--md` flag to return URLs with Markdown enabled.

	```bash
	$ writeas posts
	Local ID Token
	unsynced aaaazzzzzzzza dhuieoj23894jhf984hdfs9834hdf84j

	Account ID Title
	synced mmmmmmmm33333333 This is a post
	```

	#### Delete a post

	This permanently deletes a post you own.

	```bash
	$ writeas delete aaaazzzzzzzza
	```

	#### Update a post

	This completely overwrites an existing post you own.

	```bash
	$ echo "See you later!" \| writeas update aaaazzzzzzzza
	```

	### Composing posts

	If you simply have a penchant for never leaving your keyboard, `writeas` is great for composing new posts from the command-line. Just use the `new` subcommand.

	`writeas new` will open your favorite command-line editor, as specified by your `WRITEAS_EDITOR` or `EDITOR` environment variables (in that order), falling back to `vim` on OS X / *nix.

	Customize your post's appearance with the `--font` flag:

	\| Argument \| Appearance (Typeface) \| Word Wrap? \|
	\| -------- \| --------------------- \| ---------- \|
	\| `sans` \| Sans-serif (Open Sans) \| Yes \|
	\| `serif` \| Serif (Lora) \| Yes \|
	\| `wrap` \| Monospace \| Yes \|
	\| `mono` \| Monospace \| No \|
	\| `code` \| Syntax-highlighted monospace \| No \|

	Put it all together, e.g. publish with a sans-serif font: `writeas new --font sans`

	If you're publishing Markdown, supply the `--md` flag to get a URL back that will render Markdown, e.g.: `writeas new --font sans --md`
	diff --git a/README.md b/README.md
	index 4e281d4..41e1d54 100644
	--- a/README.md
	+++ b/README.md
	@@ -1,106 +1,111 @@
	writeas-cli
	===========
	![GPL](https://img.shields.io/github/license/writeas/writeas-cli.svg) [![Go Report Card](https://goreportcard.com/badge/github.com/writeas/writeas-cli)](https://goreportcard.com/report/github.com/writeas/writeas-cli) [![#writeas on freenode](https://img.shields.io/badge/freenode-%23writeas-blue.svg)](http://webchat.freenode.net/?channels=writeas) [![Discuss on our forum](https://img.shields.io/discourse/https/discuss.write.as/users.svg?label=forum)](https://discuss.write.as/c/development)

	Command line interface for [Write.as](https://write.as). Works on Windows, macOS, and Linux.

	## Features

	* Publish anonymously to Write.as
	* Authenticate with a Write.as account
	* A stable, easy back-end for your GUI app or desktop-based workflow
	* Compatible with our [Tor hidden service](http://writeas7pm7rcdqg.onion/)
	* Locally keeps track of any posts you make
	* Update and delete posts, anonymous and authenticated
	* Fetch any post by ID
	* Add anonymous post credentials (like for one published with the [Android app](https://play.google.com/store/apps/details?id=com.abunchtell.writeas)) for editing

	## Installing
	The easiest way to get the CLI is to download a pre-built executable for your OS.

	### Download
	[![Latest release](https://img.shields.io/github/release/writeas/writeas-cli.svg)](https://github.com/writeas/writeas-cli/releases/latest) ![Total downloads](https://img.shields.io/github/downloads/writeas/writeas-cli/total.svg)

	Get the latest version for your operating system as a standalone executable.

	Windows<br />
	Download the [64-bit](https://github.com/writeas/writeas-cli/releases/download/v1.2/writeas_1.2_windows_amd64.zip) or [32-bit](https://github.com/writeas/writeas-cli/releases/download/v1.2/writeas_1.2_windows_386.zip) executable and put it somewhere in your `%PATH%`.

	macOS<br />
	Download the [64-bit](https://github.com/writeas/writeas-cli/releases/download/v1.2/writeas_1.2_darwin_amd64.tar.gz) executable and put it somewhere in your `$PATH`, like `/usr/local/bin`.

	Debian-based Linux<br />
	```bash
	sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys DBE07445
	sudo add-apt-repository "deb http://updates.writeas.org xenial main"
	sudo apt-get update && sudo apt-get install writeas-cli
	```

	Linux (other)<br />
	Download the [64-bit](https://github.com/writeas/writeas-cli/releases/download/v1.2/writeas_1.2_linux_amd64.tar.gz) or [32-bit](https://github.com/writeas/writeas-cli/releases/download/v1.2/writeas_1.2_linux_386.tar.gz) executable and put it somewhere in your `$PATH`, like `/usr/local/bin`.

	### Go get it
	```bash
	go get github.com/writeas/writeas-cli/cmd/writeas
	```

	Once this finishes, you'll see `writeas` or `writeas.exe` inside `$GOPATH/bin/`.

	## Upgrading

	To upgrade the CLI, download and replace the executable you downloaded before.

	If you previously installed with `go get`, run it again with the `-u` option.

	```bash
	go get -u github.com/writeas/writeas-cli/cmd/writeas
	```

	## Usage

	See full usage documentation on our [User Guide](GUIDE.md).

	```
	writeas [global options] command [command options] [arguments...]

	COMMANDS:
	post Alias for default action: create post from stdin
	new Compose a new post from the command-line and publish
	publish Publish a file to Write.as
	delete Delete a post
	update Update (overwrite) a post
	get Read a raw post
	add Add an existing post locally
	posts List all of your posts
	blogs List blogs
	+ claim Claim local unsynced posts
	auth Authenticate with Write.as
	logout Log out of Write.as
	help, h Shows a list of commands or help for one command

	GLOBAL OPTIONS:
	- -c value, -b value Optional blog to post to
	- --tor, -t Perform action on Tor hidden service
	- --tor-port value Use a different port to connect to Tor (default: 9150)
	- --code Specifies this post is code
	- --md Returns post URL with Markdown enabled
	- --verbose, -v Make the operation more talkative
	- --font value Sets post font to given value (default: "mono")
	- --lang value Sets post language to given ISO 639-1 language code
	- --user-agent value Sets the User-Agent for API requests
	- --help, -h show help
	- --version, -V print the version
	+ -c value, -b value Optional blog to post to
	+ --tor, -t Perform action on Tor hidden service
	+ --tor-port value Use a different port to connect to Tor (default: 9150)
	+ --code Specifies this post is code
	+ --md Returns post URL with Markdown enabled
	+ --verbose, -v Make the operation more talkative
	+ --font value Sets post font to given value (default: "mono")
	+ --lang value Sets post language to given ISO 639-1 language code
	+ --user-agent value Sets the User-Agent for API requests
	+ --host value, -H value Operate against a custom hostname
	+ --user value, -u value Use authenticated user, other than default
	+ --help, -h show help
	+ --version, -V print the version
	```

	+> Note: the host and user flags are only available in `wf` the community edition
	+
	## Contributing to the CLI

	For a complete guide to contributing, see the [Contribution Guide](.github/CONTRIBUTING.md).

	We welcome any kind of contributions including documentation, organizational improvements, tutorials, bug reports, feature requests, new features, answering questions, etc.

	### Getting Support

	We're available on [several channels](https://write.as/contact), and prefer our [forum](https://discuss.write.as) for project discussion. Please don't use the GitHub issue tracker to ask questions.

	### Reporting Issues

	If you believe you have found a bug in the CLI or its documentation, file an issue on this repo. If you're not sure if it's a bug or not, [reach out to us](https://write.as/contact) in one way or another. Be sure to provide the version of the CLI (with `writeas --version`) in your report.
	diff --git a/api/api.go b/api/api.go
	index d3fa3fc..4540182 100644
	--- a/api/api.go
	+++ b/api/api.go
	@@ -1,267 +1,288 @@
	package api

	import (
	"fmt"
	- "path/filepath"

	"github.com/atotto/clipboard"
	writeas "github.com/writeas/go-writeas/v2"
	"github.com/writeas/web-core/posts"
	"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 client(userAgent string, tor bool) *writeas.Client {
	+func client(c cli.Context, userAgent string, tor bool) (writeas.Client, error) {
	var client *writeas.Client
	- if tor {
	- client = writeas.NewTorClient(TorPort)
	+ var clientConfig writeas.Config
	+ cfg, err := config.LoadConfig(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
	+ if err != nil {
	+ return nil, fmt.Errorf("Failed to load configuration file: %v", err)
	+ }
	+ if c.GlobalString("host") != "" {
	+ clientConfig.URL = c.GlobalString("host") + "/api"
	+ } else if cfg.Default.Host != "" {
	+ clientConfig.URL = cfg.Default.Host + "/api"
	+ } else if config.IsDev() {
	+ clientConfig.URL = config.DevBaseURL + "/api"
	} else {
	- if config.IsDev() {
	- client = writeas.NewDevClient()
	- } else {
	- client = writeas.NewClient()
	- }
	+ clientConfig.URL = config.WriteasBaseURL + "/api"
	+ }
	+ if tor {
	+ clientConfig.URL = config.TorBaseURL
	+ clientConfig.TorPort = TorPort
	}
	+
	+ client = writeas.NewClientWith(clientConfig)
	client.UserAgent = userAgent

	- return client
	+ return client, nil
	}

	func NewClient(c cli.Context, authRequired bool) (writeas.Client, error) {
	var client *writeas.Client
	- if config.IsTor(c) {
	- client = writeas.NewTorClient(TorPort)
	+ var clientConfig writeas.Config
	+ cfg, err := config.LoadConfig(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
	+ if err != nil {
	+ return nil, fmt.Errorf("Failed to load configuration file: %v", err)
	+ }
	+ if c.GlobalString("host") != "" {
	+ clientConfig.URL = c.GlobalString("host") + "/api"
	+ } else if cfg.Default.Host != "" {
	+ clientConfig.URL = cfg.Default.Host + "/api"
	+ } else if config.IsDev() {
	+ clientConfig.URL = config.DevBaseURL + "/api"
	} else {
	- if config.IsDev() {
	- client = writeas.NewDevClient()
	- } else {
	- client = writeas.NewClient()
	- }
	+ clientConfig.URL = config.WriteasBaseURL + "/api"
	}
	+ if config.IsTor(c) {
	+ clientConfig.URL = config.TorBaseURL
	+ clientConfig.TorPort = TorPort
	+ }
	+
	+ client = writeas.NewClientWith(clientConfig)
	client.UserAgent = config.UserAgent(c)
	// TODO: load user into var shared across the app
	- u, _ := config.LoadUser(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
	+ u, _ := config.LoadUser(c)
	if u != nil {
	client.SetToken(u.AccessToken)
	} else if authRequired {
	return nil, fmt.Errorf("Not currently logged in. Authenticate with: writeas auth <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)
	+func DoFetch(c *cli.Context, friendlyID, ua string, tor bool) error {
	+ cl, err := client(c, ua, tor)
	+ if err != nil {
	+ return err
	+ }

	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
	}

	// DoFetchPosts retrieves all remote posts for the
	// authenticated user
	func DoFetchPosts(c *cli.Context) ([]writeas.Post, error) {
	cl, err := NewClient(c, true)
	if err != nil {
	return nil, err
	}

	posts, err := cl.GetUserPosts()
	if err != nil {
	return nil, err
	}

	return *posts, 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(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
	}

	// DoFetchCollections retrieves a list of the currently logged in users
	// collections.
	func DoFetchCollections(c *cli.Context) ([]RemoteColl, error) {
	cl, err := NewClient(c, true)
	if err != nil {
	if config.Debug() {
	log.ErrorlnQuit("could not create new client: %v", err)
	}
	return nil, fmt.Errorf("Couldn't create new client")
	}

	colls, err := cl.GetUserCollections()
	if err != nil {
	if config.Debug() {
	log.ErrorlnQuit("failed fetching user collections: %v", err)
	}
	return nil, fmt.Errorf("Couldn't get user collections")
	}

	out := make([]RemoteColl, len(*colls))

	for i, c := range *colls {
	coll := RemoteColl{
	Alias: c.Alias,
	Title: c.Title,
	URL: c.URL,
	}
	out[i] = coll
	}

	return out, 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, &params)
	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, and removes any local references
	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(c.App.ExtraInfo()["configDir"], friendlyID)

	return nil
	}

	func DoLogIn(c *cli.Context, username, password string) error {
	- cl := client(config.UserAgent(c), config.IsTor(c))
	+ cl, err := client(c, config.UserAgent(c), config.IsTor(c))
	+ if err != nil {
	+ return err
	+ }

	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(c.App.ExtraInfo()["configDir"]), u)
	+ err = config.SaveUser(c, u)
	if err != nil {
	return err
	}
	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(c.App.ExtraInfo()["configDir"]), config.UserFile))
	- if err != nil {
	- return err
	- }
	-
	- return nil
	+ // delete local user file
	+ return config.DeleteUser(c)
	}
	diff --git a/api/sync.go b/api/sync.go
	index d687f24..dec2794 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(c.App.ExtraInfo()["configDir"]))
	if err != nil {
	return err
	}
	// Create posts directory if needed
	if cfg.Posts.Directory == "" {
	- syncSetUp(c.App.ExtraInfo()["configDir"], cfg)
	+ syncSetUp(c, 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(path string, cfg *config.UserConfig) error {
	+func syncSetUp(c cli.Context, cfg config.Config) 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(path))
	+ u, err := config.LoadUser(c)
	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(path), cfg)
	+ err = config.SaveConfig(config.UserDataDir(c.App.ExtraInfo()["configDir"]), 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/api/tor.go b/api/tor.go
	index dae5be5..d181b7f 100644
	--- a/api/tor.go
	+++ b/api/tor.go
	@@ -1,18 +1,19 @@
	package api

	import (
	"fmt"
	"net/http"

	"code.as/core/socks"
	)

	var (
	TorPort = 9150
	)

	+// TODO: never used?
	func torClient() *http.Client {
	dialSocksProxy := socks.DialSocksProxy(socks.SOCKS5, fmt.Sprintf("127.0.0.1:%d", TorPort))
	transport := &http.Transport{Dial: dialSocksProxy}
	return &http.Client{Transport: transport}
	}
	diff --git a/cmd/wf/.gitignore b/cmd/wf/.gitignore
	new file mode 100644
	index 0000000..89b7a51
	--- /dev/null
	+++ b/cmd/wf/.gitignore
	@@ -0,0 +1 @@
	+wf
	\ No newline at end of file
	diff --git a/cmd/wf/config_nix.go b/cmd/wf/config_nix.go
	new file mode 100644
	index 0000000..ddc1bff
	--- /dev/null
	+++ b/cmd/wf/config_nix.go
	@@ -0,0 +1,5 @@
	+// +build !windows
	+
	+package main
	+
	+const configDir = ".writefreely"
	diff --git a/cmd/wf/config_win.go b/cmd/wf/config_win.go
	new file mode 100644
	index 0000000..1673fa1
	--- /dev/null
	+++ b/cmd/wf/config_win.go
	@@ -0,0 +1,5 @@
	+// +build windows
	+
	+package main
	+
	+const configDir = "WriteFreely"
	diff --git a/cmd/wf/flags.go b/cmd/wf/flags.go
	new file mode 100644
	index 0000000..5245bb7
	--- /dev/null
	+++ b/cmd/wf/flags.go
	@@ -0,0 +1,16 @@
	+package main
	+
	+import (
	+ "gopkg.in/urfave/cli.v1"
	+)
	+
	+var flags = []cli.Flag{
	+ cli.StringFlag{
	+ Name: "host, H",
	+ Usage: "Operate against a custom hostname",
	+ },
	+ cli.StringFlag{
	+ Name: "user, u",
	+ Usage: "Use authenticated user, other than default",
	+ },
	+}
	diff --git a/cmd/writeas/main.go b/cmd/wf/main.go
	similarity index 92%
	copy from cmd/writeas/main.go
	copy to cmd/wf/main.go
	index c113d19..31fc450 100644
	--- a/cmd/writeas/main.go
	+++ b/cmd/wf/main.go
	@@ -1,265 +1,253 @@
	package main

	import (
	"os"

	"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(appInfo["configDir"])
	+ appInfo := map[string]string{
	+ "configDir": configDir,
	+ "version": "1.0",
	+ }
	+ config.DirMustExist(config.UserDataDir(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.Name = "wf"
	+ app.Version = appInfo["version"]
	app.Usage = "Publish text quickly"
	+ // TODO: who is the author? the contributors? link to GH?
	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.Flags = append(config.PostFlags, flags...)
	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: "posts",
	Usage: "List all of your posts",
	Description: "This will list only local posts when not currently authenticated. To list remote posts as well, first run: writeas auth <username>.",
	Action: commands.CmdListPosts,
	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: "blogs",
	Usage: "List blogs",
	Action: commands.CmdCollections,
	Flags: []cli.Flag{
	cli.BoolFlag{
	Name: "url",
	Usage: "Show list with URLs",
	},
	},
	}, {
	Name: "claim",
	Usage: "Claim local unsynced posts",
	Action: commands.CmdClaim,
	Description: "This will claim any unsynced posts local to this machine. To see which posts these are run: writeas posts.",
	Flags: []cli.Flag{
	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(dataDirName string) {
	- // Ensure we have a data directory to use
	- 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/cmd/writeas/config_nix.go b/cmd/writeas/config_nix.go
	index 6b3cb86..6c0ed02 100644
	--- a/cmd/writeas/config_nix.go
	+++ b/cmd/writeas/config_nix.go
	@@ -1,7 +1,5 @@
	// +build !windows

	package main

	-var appInfo = map[string]string{
	- "configDir": ".writeas",
	-}
	+const configDir = ".writeas"
	diff --git a/cmd/writeas/config_win.go b/cmd/writeas/config_win.go
	index 9a7eea1..43d2bca 100644
	--- a/cmd/writeas/config_win.go
	+++ b/cmd/writeas/config_win.go
	@@ -1,7 +1,5 @@
	// +build windows

	package main

	-var appInfo = map[string]string{
	- "configDir": "Write.as",
	-}
	+const configDir = "Write.as"
	diff --git a/cmd/writeas/flags.go b/cmd/writeas/flags.go
	new file mode 100644
	index 0000000..5fdaf8a
	--- /dev/null
	+++ b/cmd/writeas/flags.go
	@@ -0,0 +1,13 @@
	+package main
	+
	+import (
	+ "gopkg.in/urfave/cli.v1"
	+)
	+
	+var flags = []cli.Flag{
	+ cli.StringFlag{
	+ Name: "user, u",
	+ Hidden: true,
	+ Value: "user",
	+ },
	+}
	diff --git a/cmd/writeas/main.go b/cmd/writeas/main.go
	index c113d19..d94dfca 100644
	--- a/cmd/writeas/main.go
	+++ b/cmd/writeas/main.go
	@@ -1,265 +1,253 @@
	package main

	import (
	"os"

	"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(appInfo["configDir"])
	+ appInfo := map[string]string{
	+ "configDir": configDir,
	+ "version": "2.0",
	+ }
	+ config.DirMustExist(config.UserDataDir(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.Version = appInfo["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.Flags = append(config.PostFlags, flags...)
	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: "posts",
	Usage: "List all of your posts",
	Description: "This will list only local posts when not currently authenticated. To list remote posts as well, first run: writeas auth <username>.",
	Action: commands.CmdListPosts,
	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: "blogs",
	Usage: "List blogs",
	Action: commands.CmdCollections,
	Flags: []cli.Flag{
	cli.BoolFlag{
	Name: "url",
	Usage: "Show list with URLs",
	},
	},
	}, {
	Name: "claim",
	Usage: "Claim local unsynced posts",
	Action: commands.CmdClaim,
	Description: "This will claim any unsynced posts local to this machine. To see which posts these are run: writeas posts.",
	Flags: []cli.Flag{
	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(dataDirName string) {
	- // Ensure we have a data directory to use
	- 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 e594620..7e30f75 100644
	--- a/commands/commands.go
	+++ b/commands/commands.go
	@@ -1,360 +1,361 @@
	package commands

	import (
	"fmt"
	"io/ioutil"
	"os"
	"path/filepath"
	"text/tabwriter"

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

	- u, _ := config.LoadUser(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
	+ u, _ := config.LoadUser(c)
	if token == "" {
	// Search for the token locally
	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 <token>", 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 cli.NewExitError(fmt.Sprintf("Couldn't delete remote copy: %v", err), 1)
	}

	// Delete local file, if necessary
	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 cli.NewExitError(fmt.Sprintf("Couldn't delete local copy: %v", err), 1)
	}
	}

	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, _ := config.LoadUser(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
	+ u, _ := config.LoadUser(c)
	if token == "" {
	// Search for the token locally
	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 <token>", 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 <postId>", 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)
	+ return api.DoFetch(c, 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 <postId> <token>", 1)
	}

	err := api.AddPost(c, friendlyID, token)
	return err
	}

	func CmdListPosts(c *cli.Context) error {
	urls := c.Bool("url")
	ids := c.Bool("id")

	var p api.Post
	posts := api.GetPosts(c)
	tw := tabwriter.NewWriter(os.Stdout, 10, 0, 2, ' ', tabwriter.TabIndent)
	numPosts := len(*posts)
	if ids \|\| !urls && numPosts != 0 {
	fmt.Fprintf(tw, "Local\t%s\t%s\t\n", "ID", "Token")
	} else if numPosts != 0 {
	fmt.Fprintf(tw, "Local\t%s\t%s\t\n", "URL", "Token")
	} else {
	fmt.Fprintf(tw, "No local posts found\n")
	}
	for i := range *posts {
	p = (*posts)[numPosts-1-i]
	if ids \|\| !urls {
	fmt.Fprintf(tw, "unsynced\t%s\t%s\t\n", p.ID, p.EditToken)
	} else {
	fmt.Fprintf(tw, "unsynced\t%s\t%s\t\n", getPostURL(c, p.ID), p.EditToken)
	}
	}
	- u, _ := config.LoadUser(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
	+ u, _ := config.LoadUser(c)
	if u != nil {
	remotePosts, err := api.GetUserPosts(c)
	if err != nil {
	fmt.Println(err)
	}

	if len(remotePosts) > 0 {
	identifier := "URL"
	if ids \|\| !urls {
	identifier = "ID"
	}
	fmt.Fprintf(tw, "\nAccount\t%s\t%s\t\n", identifier, "Title")
	}
	for _, p := range remotePosts {
	identifier := getPostURL(c, p.ID)
	if ids \|\| !urls {
	identifier = p.ID
	}
	synced := "unsynced"
	if p.Synced {
	synced = "synced"
	}
	fmt.Fprintf(tw, "%s\t%s\t%s\t\n", synced, identifier, p.Title)
	}
	}
	return tw.Flush()
	}

	func getPostURL(c *cli.Context, slug string) string {
	base := config.WriteasBaseURL
	if config.IsDev() {
	base = config.DevBaseURL
	}
	ext := ""
	// Output URL in requested format
	if c.Bool("md") {
	ext = ".md"
	}
	return fmt.Sprintf("%s/%s%s", base, slug, ext)
	}

	func CmdCollections(c *cli.Context) error {
	- u, err := config.LoadUser(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
	+ u, err := config.LoadUser(c)
	if err != nil {
	return cli.NewExitError(fmt.Sprintf("couldn't load config: %v", err), 1)
	}
	if u == nil {
	return cli.NewExitError("You must be authenticated to view collections.\nLog in first with: writeas auth <username>", 1)
	}
	colls, err := api.DoFetchCollections(c)
	if err != nil {
	return cli.NewExitError(fmt.Sprintf("Couldn't get collections for user %s: %v", u.User.Username, err), 1)
	}
	urls := c.Bool("url")
	tw := tabwriter.NewWriter(os.Stdout, 8, 0, 2, ' ', tabwriter.TabIndent)
	detail := "Title"
	if urls {
	detail = "URL"
	}
	fmt.Fprintf(tw, "%s\t%s\t\n", "Alias", detail)
	for _, c := range colls {
	dData := c.Title
	if urls {
	dData = c.URL
	}
	fmt.Fprintf(tw, "%s\t%s\t\n", c.Alias, dData)
	}
	tw.Flush()
	return nil
	}

	func CmdClaim(c *cli.Context) error {
	- u, err := config.LoadUser(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
	+ u, err := config.LoadUser(c)
	if err != nil {
	return cli.NewExitError(fmt.Sprintf("couldn't load config: %v", err), 1)
	}
	if u == nil {
	return cli.NewExitError("You must be authenticated to claim local posts.\nLog in first with: writeas auth <username>", 1)
	}

	localPosts := api.GetPosts(c)
	if len(*localPosts) == 0 {
	return nil
	}

	log.Info(c, "Claiming %d post(s) for %s...", len(*localPosts), u.User.Username)
	results, err := api.ClaimPosts(c, localPosts)
	if err != nil {
	return cli.NewExitError(fmt.Sprintf("Failed to claim posts: %v", err), 1)
	}

	var okCount, errCount int
	for _, r := range *results {
	id := r.ID
	if id == "" {
	// No top-level ID, so the claim was successful
	id = r.Post.ID
	}
	status := fmt.Sprintf("Post %s...", id)
	if r.ErrorMessage != "" {
	log.Errorln("%serror: %v", status, r.ErrorMessage)
	errCount++
	} else {
	log.Info(c, "%sOK", status)
	okCount++
	// only delete local if successful
	api.RemovePost(c.App.ExtraInfo()["configDir"], id)
	}
	}
	log.Info(c, "%d claimed, %d failed", okCount, errCount)
	return nil
	}

	func CmdAuth(c *cli.Context) error {
	// Check configuration
	- u, err := config.LoadUser(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
	+ u, err := config.LoadUser(c)
	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
	+ // TODO: after global config, check for default user
	username := c.Args().Get(0)
	if username == "" {
	return cli.NewExitError("usage: writeas auth <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)
	}
	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/config.go b/config/config.go
	index 4c9c59d..6ded22b 100644
	--- a/config/config.go
	+++ b/config/config.go
	@@ -1,63 +1,74 @@
	package config

	import (
	"os"
	"path/filepath"

	ini "gopkg.in/ini.v1"
	)

	const (
	- UserConfigFile = "config.ini"
	+ // ConfigFile is the full filename for application configuration files
	+ ConfigFile = "config.ini"
	)

	type (
	+ // APIConfig is not currently used
	APIConfig struct {
	}

	+ // PostsConfig stores the directory for the user post cache
	PostsConfig struct {
	Directory string `ini:"directory"`
	}

	- UserConfig struct {
	- API APIConfig `ini:"api"`
	- Posts PostsConfig `ini:"posts"`
	+ // DefaultConfig stores the default host and user to authenticate with
	+ DefaultConfig struct {
	+ Host string `ini:"host"`
	+ User string `ini:"user"`
	+ }
	+
	+ // Config represents the entire base configuration
	+ Config struct {
	+ API APIConfig `ini:"api"`
	+ Default DefaultConfig `ini:"default"`
	+ Posts PostsConfig `ini:"posts"`
	}
	)

	-func LoadConfig(dataDir string) (*UserConfig, error) {
	+func LoadConfig(dataDir string) (*Config, error) {
	// TODO: load config to var shared across app
	- cfg, err := ini.LooseLoad(filepath.Join(dataDir, UserConfigFile))
	+ cfg, err := ini.LooseLoad(filepath.Join(dataDir, ConfigFile))
	if err != nil {
	return nil, err
	}

	// Parse INI file
	- uc := &UserConfig{}
	+ uc := &Config{}
	err = cfg.MapTo(uc)
	if err != nil {
	return nil, err
	}
	return uc, nil
	}

	-func SaveConfig(dataDir string, uc *UserConfig) error {
	+func SaveConfig(dataDir string, uc *Config) error {
	cfg := ini.Empty()
	err := ini.ReflectFrom(cfg, uc)
	if err != nil {
	return err
	}

	- return cfg.SaveTo(filepath.Join(dataDir, UserConfigFile))
	+ return cfg.SaveTo(filepath.Join(dataDir, ConfigFile))
	}

	var editors = []string{"WRITEAS_EDITOR", "EDITOR"}

	func GetConfiguredEditor() string {
	for _, v := range editors {
	if e := os.Getenv(v); e != "" {
	return e
	}
	}
	return ""
	}
	diff --git a/config/directories.go b/config/directories.go
	index 8373835..e2a68f3 100644
	--- a/config/directories.go
	+++ b/config/directories.go
	@@ -1,20 +1,40 @@
	package config

	import (
	"os"
	"path/filepath"

	"github.com/writeas/writeas-cli/fileutils"
	+ "github.com/writeas/writeas-cli/log"
	)

	+// UserDataDir returns a platform specific directory under the user's home
	+// directory
	func UserDataDir(dataDirName string) string {
	return filepath.Join(parentDataDir(), dataDirName)
	}

	-func DataDirExists(dataDirName string) bool {
	- return fileutils.Exists(UserDataDir(dataDirName))
	+func dataDirExists(dataDirName string) bool {
	+ return fileutils.Exists(dataDirName)
	}

	-func CreateDataDir(dataDirName string) error {
	- return os.Mkdir(UserDataDir(dataDirName), 0700)
	+func createDataDir(dataDirName string) error {
	+ return os.Mkdir(dataDirName, 0700)
	+}
	+
	+// DirMustExist checks for a directory, creates it if not found and either
	+// panics or logs and error depending on the status of Debug
	+func DirMustExist(dataDirName string) {
	+ // Ensure we have a data directory to use
	+ if !dataDirExists(dataDirName) {
	+ err := createDataDir(dataDirName)
	+ if err != nil {
	+ if Debug() {
	+ panic(err)
	+ } else {
	+ log.Errorln("Error creating data directory: %s", err)
	+ return
	+ }
	+ }
	+ }
	}
	diff --git a/config/options.go b/config/options.go
	index 1abf9ee..5bd0a18 100644
	--- a/config/options.go
	+++ b/config/options.go
	@@ -1,56 +1,80 @@
	package config

	import (
	+ "net/url"
	+
	"github.com/cloudfoundry/jibber_jabber"
	"github.com/writeas/writeas-cli/log"
	cli "gopkg.in/urfave/cli.v1"
	)

	// Application constants.
	const (
	- Version = "2.0"
	- defaultUserAgent = "writeas-cli v" + Version
	+ defaultUserAgent = "writeas-cli v"
	// Defaults for posts on Write.as.
	DefaultFont = PostFontMono
	WriteasBaseURL = "https://write.as"
	DevBaseURL = "https://development.write.as"
	TorBaseURL = "http://writeas7pm7rcdqg.onion"
	)

	func UserAgent(c *cli.Context) string {
	ua := c.String("user-agent")
	if ua == "" {
	- return defaultUserAgent
	+ return defaultUserAgent + c.App.ExtraInfo()["version"]
	}
	- return ua + " (" + defaultUserAgent + ")"
	+ return ua + " (" + defaultUserAgent + c.App.ExtraInfo()["version"] + ")"
	}

	func IsTor(c *cli.Context) bool {
	return c.Bool("tor") \|\| c.Bool("t")
	}

	func Language(c *cli.Context, auto bool) string {
	if l := c.String("lang"); l != "" {
	return l
	}
	if !auto {
	return ""
	}
	// Automatically detect language
	l, err := jibber_jabber.DetectLanguage()
	if err != nil {
	log.Info(c, "Language detection failed: %s", err)
	return ""
	}
	return l
	}

	func Collection(c *cli.Context) string {
	if coll := c.String("c"); coll != "" {
	return coll
	}
	if coll := c.String("b"); coll != "" {
	return coll
	}
	return ""
	}
	+
	+// HostDirectory returns the sub directory string for the host. Order of
	+// precedence is a host flag if any, then the configured default, if any
	+func HostDirectory(c *cli.Context) (string, error) {
	+ cfg, err := LoadConfig(UserDataDir(c.App.ExtraInfo()["configDir"]))
	+ if err != nil {
	+ return "", err
	+ }
	+ // flag takes precedence over defaults
	+ if hostFlag := c.GlobalString("host"); hostFlag != "" {
	+ u, err := url.Parse(hostFlag)
	+ if err != nil {
	+ return "", err
	+ }
	+ return u.Hostname(), nil
	+ }
	+
	+ u, err := url.Parse(cfg.Default.Host)
	+ if err != nil {
	+ return "", err
	+ }
	+ return u.Hostname(), nil
	+}
	diff --git a/config/user.go b/config/user.go
	index 21dd8f9..af9c710 100644
	--- a/config/user.go
	+++ b/config/user.go
	@@ -1,47 +1,121 @@
	package config

	import (
	"encoding/json"
	"io/ioutil"
	"path/filepath"

	writeas "github.com/writeas/go-writeas/v2"
	"github.com/writeas/writeas-cli/fileutils"
	+ "gopkg.in/urfave/cli.v1"
	)

	-const UserFile = "user.json"
	-
	-func LoadUser(dataDir string) (*writeas.AuthUser, error) {
	- fname := filepath.Join(dataDir, UserFile)
	+func LoadUser(c cli.Context) (writeas.AuthUser, error) {
	+ dir, err := userHostDir(c)
	+ if err != nil {
	+ return nil, err
	+ }
	+ username, err := currentUser(c)
	+ if err != nil {
	+ return nil, err
	+ }
	+ if username == "user" {
	+ username = ""
	+ }
	+ fname := filepath.Join(dir, username, "user.json")
	userJSON, err := ioutil.ReadFile(fname)
	if err != nil {
	if !fileutils.Exists(fname) {
	// Don't return a file-not-found error
	return nil, nil
	}
	return nil, err
	}

	// Parse JSON file
	u := &writeas.AuthUser{}
	err = json.Unmarshal(userJSON, u)
	if err != nil {
	return nil, err
	}
	return u, nil
	}

	-func SaveUser(dataDir string, u *writeas.AuthUser) error {
	+func DeleteUser(c *cli.Context) error {
	+ dir, err := userHostDir(c)
	+ if err != nil {
	+ return err
	+ }
	+
	+ username, err := currentUser(c)
	+ if err != nil {
	+ return err
	+ }
	+
	+ if username == "user" {
	+ username = ""
	+ }
	+
	+ return fileutils.DeleteFile(filepath.Join(dir, username, "user.json"))
	+}
	+
	+func SaveUser(c cli.Context, u writeas.AuthUser) error {
	// Marshal struct into pretty-printed JSON
	userJSON, err := json.MarshalIndent(u, "", " ")
	if err != nil {
	return err
	}

	+ dir, err := userHostDir(c)
	+ if err != nil {
	+ return err
	+ }
	// Save file
	- err = ioutil.WriteFile(filepath.Join(dataDir, UserFile), userJSON, 0600)
	+ username, err := currentUser(c)
	+ if err != nil {
	+ return err
	+ }
	+ if username != "user" {
	+ dir = filepath.Join(dir, u.User.Username)
	+ }
	+ DirMustExist(dir)
	+ err = ioutil.WriteFile(filepath.Join(dir, "user.json"), userJSON, 0600)
	if err != nil {
	return err
	}
	return nil
	}
	+
	+// userHostDir returns the path to the user data directory with the host based
	+// subpath if the host flag is set
	+func userHostDir(c *cli.Context) (string, error) {
	+ dataDir := UserDataDir(c.App.ExtraInfo()["configDir"])
	+ hostDir, err := HostDirectory(c)
	+ if err != nil {
	+ return "", err
	+ }
	+ return filepath.Join(dataDir, hostDir), nil
	+}
	+
	+func currentUser(c *cli.Context) (string, error) {
	+ hostDir, err := userHostDir(c)
	+ if err != nil {
	+ return "", err
	+ }
	+ cfg, err := LoadConfig(hostDir)
	+ if err != nil {
	+ return "", err
	+ }
	+ if cfg.Default.User == "" {
	+ cfg, err = LoadConfig(UserDataDir(c.App.ExtraInfo()["configDir"]))
	+ if err != nil {
	+ return "", err
	+ }
	+ }
	+
	+ if c.GlobalString("user") != "" {
	+ return c.GlobalString("user"), nil
	+ }
	+
	+ return cfg.Default.User, nil
	+}

File Metadata

Mime Type: text/x-diff
Expires: Sat, Jun 7, 12:33 AM (12 h, 17 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 3259544

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions