No OneTemporary
Actions

Size

57 KB

Subscribers

None

View Options

	diff --git a/cmd/writeas/api.go b/api/api.go
	similarity index 67%
	rename from cmd/writeas/api.go
	rename to api/api.go
	index b46c022..14ac180 100644
	--- a/cmd/writeas/api.go
	+++ b/api/api.go
	@@ -1,220 +1,218 @@
	-package main
	+package api

	import (
	"fmt"
	"path/filepath"

	"github.com/atotto/clipboard"
	"github.com/writeas/web-core/posts"
	+ "github.com/writeas/writeas-cli/config"
	"github.com/writeas/writeas-cli/fileutils"
	+ "github.com/writeas/writeas-cli/log"
	writeas "go.code.as/writeas.v2"
	cli "gopkg.in/urfave/cli.v1"
	)

	-const (
	- defaultUserAgent = "writeas-cli v" + version
	-)
	-
	func client(userAgent string, tor bool) *writeas.Client {
	var client *writeas.Client
	if tor {
	- client = writeas.NewTorClient(torPort)
	+ client = writeas.NewTorClient(TorPort)
	} else {
	- if isDev() {
	+ if config.IsDev() {
	client = writeas.NewDevClient()
	} else {
	client = writeas.NewClient()
	}
	}
	client.UserAgent = userAgent

	return client
	}

	-func newClient(c cli.Context, authRequired bool) (writeas.Client, error) {
	+func NewClient(c cli.Context, authRequired bool) (writeas.Client, error) {
	var client *writeas.Client
	- if isTor(c) {
	- client = writeas.NewTorClient(torPort)
	+ if config.IsTor(c) {
	+ client = writeas.NewTorClient(TorPort)
	} else {
	- if isDev() {
	+ if config.IsDev() {
	client = writeas.NewDevClient()
	} else {
	client = writeas.NewClient()
	}
	}
	- client.UserAgent = userAgent(c)
	+ client.UserAgent = config.UserAgent(c)
	// TODO: load user into var shared across the app
	- u, _ := loadUser()
	+ u, _ := config.LoadUser(config.UserDataDir())
	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)

	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)
	+ cl, _ := NewClient(c, false)

	pp := &writeas.PostParams{
	- Font: getFont(code, font),
	- Collection: collection(c),
	+ Font: config.GetFont(code, font),
	+ Collection: config.Collection(c),
	}
	pp.Title, pp.Content = posts.ExtractTitle(string(post))
	- if lang := language(c, true); lang != "" {
	+ 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 = torBaseURL
	- } else if isDev() {
	- url = devBaseURL
	+ url = config.TorBaseURL
	+ } else if config.IsDev() {
	+ url = config.DevBaseURL
	} else {
	- url = writeasBaseURL
	+ url = config.WriteasBaseURL
	}
	url += "/" + p.ID
	// Output URL in requested format
	if c.Bool("md") {
	url += ".md"
	}
	}

	if cl.Token() == "" {
	// Store post locally, since we're not authenticated
	- addPost(p.ID, p.Token)
	+ AddPost(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)
	+ log.Errorln("writeas: Didn't copy to clipboard: %s", err)
	} else {
	- Info(c, "Copied to clipboard.")
	+ log.Info(c, "Copied to clipboard.")
	}

	// Output URL
	fmt.Printf("%s\n", url)

	return p, nil
	}

	// DoUpdate updates the given post on Write.as.
	func DoUpdate(c *cli.Context, post []byte, friendlyID, token, font string, tor, code bool) error {
	- cl, _ := newClient(c, false)
	+ cl, _ := NewClient(c, false)

	params := writeas.PostParams{}
	params.Title, params.Content = posts.ExtractTitle(string(post))
	- if lang := language(c, false); lang != "" {
	+ if lang := config.Language(c, false); lang != "" {
	params.Language = &lang
	}
	if code \|\| font != "" {
	- params.Font = getFont(code, font)
	+ params.Font = config.GetFont(code, font)
	}

	_, err := cl.UpdatePost(friendlyID, token, &params)
	if err != nil {
	- if debug {
	- ErrorlnQuit("Problem updating: %v", err)
	+ if config.Debug() {
	+ log.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.")
	+ log.Info(c, "Post updated via hidden service.")
	} else {
	- Info(c, "Post updated.")
	+ log.Info(c, "Post updated.")
	}
	return nil
	}

	// DoDelete deletes the given post on Write.as.
	func DoDelete(c *cli.Context, friendlyID, token string, tor bool) error {
	- cl, _ := newClient(c, false)
	+ cl, _ := NewClient(c, false)

	err := cl.DeletePost(friendlyID, token)
	if err != nil {
	- if debug {
	- ErrorlnQuit("Problem deleting: %v", err)
	+ if config.Debug() {
	+ log.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.")
	+ log.Info(c, "Post deleted from hidden service.")
	} else {
	- Info(c, "Post deleted.")
	+ log.Info(c, "Post deleted.")
	}
	removePost(friendlyID)

	return nil
	}

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

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

	- err = saveUser(u)
	+ err = config.SaveUser(config.UserDataDir(), 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)
	+ cl, err := NewClient(c, true)
	if err != nil {
	return err
	}

	err = cl.LogOut()
	if err != nil {
	- if debug {
	- ErrorlnQuit("Problem logging out: %v", err)
	+ if config.Debug() {
	+ log.ErrorlnQuit("Problem logging out: %v", err)
	}
	return err
	}

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

	return nil
	}
	diff --git a/cmd/writeas/posts.go b/api/posts.go
	similarity index 53%
	rename from cmd/writeas/posts.go
	rename to api/posts.go
	index 180693b..3f005f2 100644
	--- a/cmd/writeas/posts.go
	+++ b/api/posts.go
	@@ -1,166 +1,194 @@
	-package main
	+package api

	import (
	+ "bufio"
	"fmt"
	+ "io"
	"io/ioutil"
	"os"
	"path/filepath"
	"strings"

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

	const (
	postsFile = "posts.psv"
	separator = `\|`
	)

	// Post holds the basic authentication information for a Write.as post.
	type Post struct {
	ID string
	EditToken string
	}

	-func 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 {
	- 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)
	+func AddPost(id, token string) error {
	+ f, err := os.OpenFile(filepath.Join(config.UserDataDir(), postsFile), os.O_WRONLY\|os.O_APPEND\|os.O_CREATE, 0600)
	if err != nil {
	return fmt.Errorf("Error creating local posts list: %s", err)
	}
	defer f.Close()

	l := fmt.Sprintf("%s%s%s\n", id, separator, token)

	if _, err = f.WriteString(l); err != nil {
	return fmt.Errorf("Error writing to local posts list: %s", err)
	}

	return nil
	}

	-func tokenFromID(id string) string {
	- post := fileutils.FindLine(filepath.Join(userDataDir(), postsFile), id)
	+func TokenFromID(id string) string {
	+ post := fileutils.FindLine(filepath.Join(config.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)
	+ fileutils.RemoveLine(filepath.Join(config.UserDataDir(), postsFile), id)
	}

	-func getPosts() *[]Post {
	- lines := fileutils.ReadData(filepath.Join(userDataDir(), postsFile))
	+func GetPosts() *[]Post {
	+ lines := fileutils.ReadData(filepath.Join(config.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) {
	+func ComposeNewPost() (string, *[]byte) {
	f, err := fileutils.TempFile(os.TempDir(), "WApost", "txt")
	if err != nil {
	- if debug {
	+ if config.Debug() {
	panic(err)
	} else {
	- Errorln("Error creating temp file: %s", err)
	+ log.Errorln("Error creating temp file: %s", err)
	return "", nil
	}
	}
	f.Close()

	- cmd := editPostCmd(f.Name())
	+ cmd := config.EditPostCmd(f.Name())
	if cmd == nil {
	os.Remove(f.Name())

	- fmt.Println(noEditorErr)
	+ fmt.Println(config.NoEditorErr)
	return "", nil
	}
	cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
	if err := cmd.Start(); err != nil {
	os.Remove(f.Name())

	- if debug {
	+ if config.Debug() {
	panic(err)
	} else {
	- Errorln("Error starting editor: %s", err)
	+ log.Errorln("Error starting editor: %s", err)
	return "", nil
	}
	}

	// If something fails past this point, the temporary post file won't be
	// removed automatically. Calling function should handle this.
	if err := cmd.Wait(); err != nil {
	- if debug {
	+ if config.Debug() {
	panic(err)
	} else {
	- Errorln("Editor finished with error: %s", err)
	+ log.Errorln("Editor finished with error: %s", err)
	return "", nil
	}
	}

	post, err := ioutil.ReadFile(f.Name())
	if err != nil {
	- if debug {
	+ if config.Debug() {
	panic(err)
	} else {
	- Errorln("Error reading post: %s", err)
	+ log.Errorln("Error reading post: %s", err)
	return "", nil
	}
	}
	return f.Name(), &post
	}

	func WritePost(postsDir string, p *writeas.Post) error {
	postFilename := p.ID
	collDir := ""
	if p.Collection != nil {
	postFilename = p.Slug
	collDir = p.Collection.Alias
	}
	- postFilename += postFileExt
	+ postFilename += PostFileExt

	txtFile := p.Content
	if p.Title != "" {
	txtFile = "# " + p.Title + "\n\n" + txtFile
	}
	return ioutil.WriteFile(filepath.Join(postsDir, collDir, postFilename), []byte(txtFile), 0644)
	}
	+
	+func HandlePost(fullPost []byte, c cli.Context) (writeas.Post, error) {
	+ tor := config.IsTor(c)
	+ if c.Int("tor-port") != 0 {
	+ TorPort = c.Int("tor-port")
	+ }
	+ if tor {
	+ log.Info(c, "Posting to hidden service...")
	+ } else {
	+ log.Info(c, "Posting...")
	+ }
	+
	+ return DoPost(c, fullPost, c.String("font"), false, tor, c.Bool("code"))
	+}
	+
	+func ReadStdIn() []byte {
	+ numBytes, numChunks := int64(0), int64(0)
	+ r := bufio.NewReader(os.Stdin)
	+ fullPost := []byte{}
	+ buf := make([]byte, 0, 1024)
	+ for {
	+ n, err := r.Read(buf[:cap(buf)])
	+ buf = buf[:n]
	+ if n == 0 {
	+ if err == nil {
	+ continue
	+ }
	+ if err == io.EOF {
	+ break
	+ }
	+ log.ErrorlnQuit("Error reading from stdin: %v", err)
	+ }
	+ numChunks++
	+ numBytes += int64(len(buf))
	+
	+ fullPost = append(fullPost, buf...)
	+ if err != nil && err != io.EOF {
	+ log.ErrorlnQuit("Error appending to end of post: %v", err)
	+ }
	+ }
	+
	+ return fullPost
	+}
	diff --git a/cmd/writeas/sync.go b/api/sync.go
	similarity index 71%
	rename from cmd/writeas/sync.go
	rename to api/sync.go
	index c14a8f5..22c1a01 100644
	--- a/cmd/writeas/sync.go
	+++ b/api/sync.go
	@@ -1,130 +1,131 @@
	-package main
	+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"
	+ PostFileExt = ".txt"
	userFilename = "writeas_user"
	)

	-func cmdPull(c *cli.Context) error {
	- cfg, err := loadConfig()
	+func CmdPull(c *cli.Context) error {
	+ cfg, err := config.LoadConfig(config.UserDataDir())
	if err != nil {
	return err
	}
	// Create posts directory if needed
	if cfg.Posts.Directory == "" {
	syncSetUp(cfg)
	}

	// Fetch posts
	- cl, err := newClient(c, true)
	+ 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)) {
	- Info(c, "Creating folder "+collDir)
	+ log.Info(c, "Creating folder "+collDir)
	err = os.Mkdir(filepath.Join(cfg.Posts.Directory, collDir), 0755)
	if err != nil {
	- Errorln("Error creating blog directory %s: %s. Skipping post %s.", collDir, err, postFilename)
	+ log.Errorln("Error creating blog directory %s: %s. Skipping post %s.", collDir, err, postFilename)
	continue
	}
	}
	}
	- postFilename += postFileExt
	+ 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 {
	- Errorln("Error creating file %s: %s", postFilename, err)
	+ log.Errorln("Error creating file %s: %s", postFilename, err)
	}
	- Info(c, "Saved post "+postFilename)
	+ 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 {
	- Errorln("Error setting time on %s: %s", postFilename, err)
	+ log.Errorln("Error setting time on %s: %s", postFilename, err)
	}
	}

	return nil
	}

	-// TODO: move UserConfig to its own package, and this to sync package
	-func syncSetUp(cfg *UserConfig) error {
	+func syncSetUp(cfg *config.UserConfig) error {
	// Get user information and fail early (before we make the user do
	// anything), if we're going to
	- u, err := loadUser()
	+ u, err := config.LoadUser(config.UserDataDir())
	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 debug {
	- Errorln("Error creating data directory: %s", err)
	+ 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 = saveConfig(cfg)
	+ err = config.SaveConfig(config.UserDataDir(), cfg)
	if err != nil {
	- if debug {
	- Errorln("Unable to save config: %s", err)
	+ if config.Debug() {
	+ log.Errorln("Unable to save config: %s", err)
	}
	return err
	}
	fmt.Println("Saved config.")

	return nil
	}
	diff --git a/cmd/writeas/tor.go b/api/tor.go
	similarity index 81%
	rename from cmd/writeas/tor.go
	rename to api/tor.go
	index d4dc585..dae5be5 100644
	--- a/cmd/writeas/tor.go
	+++ b/api/tor.go
	@@ -1,18 +1,18 @@
	-package main
	+package api

	import (
	"fmt"
	"net/http"

	"code.as/core/socks"
	)

	var (
	- torPort = 9150
	+ TorPort = 9150
	)

	func torClient() *http.Client {
	- dialSocksProxy := socks.DialSocksProxy(socks.SOCKS5, fmt.Sprintf("127.0.0.1:%d", torPort))
	+ 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/writeas/config.go b/cmd/writeas/config.go
	deleted file mode 100644
	index bf08f2c..0000000
	--- a/cmd/writeas/config.go
	+++ /dev/null
	@@ -1,7 +0,0 @@
	-// +build !debug
	-
	-package main
	-
	-const (
	- debug = false
	-)
	diff --git a/cmd/writeas/config_debug.go b/cmd/writeas/config_debug.go
	deleted file mode 100644
	index d51d841..0000000
	--- a/cmd/writeas/config_debug.go
	+++ /dev/null
	@@ -1,7 +0,0 @@
	-// +build debug
	-
	-package main
	-
	-const (
	- debug = true
	-)
	diff --git a/cmd/writeas/edit.go b/cmd/writeas/edit.go
	deleted file mode 100644
	index fdf72b7..0000000
	--- a/cmd/writeas/edit.go
	+++ /dev/null
	@@ -1,16 +0,0 @@
	-package main
	-
	-import (
	- "os"
	-)
	-
	-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/cmd/writeas/cli.go b/cmd/writeas/main.go
	similarity index 68%
	rename from cmd/writeas/cli.go
	rename to cmd/writeas/main.go
	index 82c3c62..cff6657 100644
	--- a/cmd/writeas/cli.go
	+++ b/cmd/writeas/main.go
	@@ -1,360 +1,263 @@
	package main

	import (
	- "bufio"
	- "io"
	- "log"
	"os"

	- writeas "go.code.as/writeas.v2"
	+ "github.com/writeas/writeas-cli/api"
	+ "github.com/writeas/writeas-cli/commands"
	+ "github.com/writeas/writeas-cli/config"
	+ "github.com/writeas/writeas-cli/log"
	cli "gopkg.in/urfave/cli.v1"
	)

	-// 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.99-dev"
	-)
	-
	-// 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: "md",
	- Usage: "Returns post URL with Markdown enabled",
	- },
	- 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.Version = config.Version
	app.Usage = "Publish text quickly"
	app.Authors = []cli.Author{
	{
	Name: "Write.as",
	Email: "hello@write.as",
	},
	}
	- app.Action = cmdPost
	- app.Flags = postFlags
	+ app.Action = commands.CmdPost
	+ app.Flags = config.PostFlags
	app.Commands = []cli.Command{
	{
	Name: "post",
	Usage: "Alias for default action: create post from stdin",
	- Action: cmdPost,
	- Flags: postFlags,
	+ 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: cmdNew,
	- Flags: postFlags,
	+ Action: commands.CmdNew,
	+ Flags: config.PostFlags,
	},
	{
	Name: "publish",
	Usage: "Publish a file to Write.as",
	- Action: cmdPublish,
	- Flags: postFlags,
	+ Action: commands.CmdPublish,
	+ Flags: config.PostFlags,
	},
	{
	Name: "delete",
	Usage: "Delete a post",
	- Action: cmdDelete,
	+ 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: cmdUpdate,
	+ 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: cmdGet,
	+ 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: cmdAdd,
	+ Action: commands.CmdAdd,
	},
	{
	Name: "list",
	Usage: "List local posts",
	- Action: cmdList,
	+ Action: commands.CmdList,
	Flags: []cli.Flag{
	cli.BoolFlag{
	Name: "id",
	Usage: "Show list with post IDs (default)",
	},
	cli.BoolFlag{
	Name: "md",
	Usage: "Use with --url to return URLs with Markdown enabled",
	},
	cli.BoolFlag{
	Name: "url",
	Usage: "Show list with URLs",
	},
	},
	},
	{
	Name: "fetch",
	Usage: "Fetch authenticated user's Write.as posts",
	- Action: cmdPull,
	+ Action: api.CmdPull,
	Flags: []cli.Flag{
	cli.BoolFlag{
	Name: "tor, t",
	Usage: "Authenticate via Tor hidden service",
	},
	cli.IntFlag{
	Name: "tor-port",
	Usage: "Use a different port to connect to Tor",
	Value: 9150,
	},
	cli.BoolFlag{
	Name: "verbose, v",
	Usage: "Make the operation more talkative",
	},
	},
	},
	{
	Name: "auth",
	Usage: "Authenticate with Write.as",
	- Action: cmdAuth,
	+ 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: cmdLogOut,
	+ 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() {
	// 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
	+ if !config.DataDirExists() {
	+ err := config.CreateDataDir()
	+ if err != nil {
	+ if config.Debug() {
	+ panic(err)
	+ } else {
	+ log.Errorln("Error creating data directory: %s", err)
	+ return
	}
	- 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/options.go b/cmd/writeas/options.go
	deleted file mode 100644
	index 1b0e065..0000000
	--- a/cmd/writeas/options.go
	+++ /dev/null
	@@ -1,44 +0,0 @@
	-package main
	-
	-import (
	- "github.com/cloudfoundry/jibber_jabber"
	- cli "gopkg.in/urfave/cli.v1"
	-)
	-
	-func userAgent(c *cli.Context) string {
	- ua := c.String("user-agent")
	- if ua == "" {
	- return defaultUserAgent
	- }
	- return ua + " (" + defaultUserAgent + ")"
	-}
	-
	-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 {
	- 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 ""
	-}
	diff --git a/cmd/writeas/userconfig.go b/cmd/writeas/userconfig.go
	deleted file mode 100644
	index 66a48e7..0000000
	--- a/cmd/writeas/userconfig.go
	+++ /dev/null
	@@ -1,91 +0,0 @@
	-package main
	-
	-import (
	- "encoding/json"
	- "io/ioutil"
	- "path/filepath"
	-
	- "github.com/writeas/writeas-cli/fileutils"
	- writeas "go.code.as/writeas.v2"
	- ini "gopkg.in/ini.v1"
	-)
	-
	-const (
	- userConfigFile = "config.ini"
	- userFile = "user.json"
	-)
	-
	-type (
	- APIConfig struct {
	- }
	-
	- PostsConfig struct {
	- Directory string `ini:"directory"`
	- }
	-
	- UserConfig struct {
	- API APIConfig `ini:"api"`
	- Posts PostsConfig `ini:"posts"`
	- }
	-)
	-
	-func loadConfig() (*UserConfig, error) {
	- // TODO: load config to var shared across app
	- cfg, err := ini.LooseLoad(filepath.Join(userDataDir(), userConfigFile))
	- if err != nil {
	- return nil, err
	- }
	-
	- // Parse INI file
	- uc := &UserConfig{}
	- err = cfg.MapTo(uc)
	- if err != nil {
	- return nil, err
	- }
	- return uc, nil
	-}
	-
	-func saveConfig(uc *UserConfig) error {
	- cfg := ini.Empty()
	- err := ini.ReflectFrom(cfg, uc)
	- if err != nil {
	- return err
	- }
	-
	- return cfg.SaveTo(filepath.Join(userDataDir(), userConfigFile))
	-}
	-
	-func loadUser() (*writeas.AuthUser, error) {
	- fname := filepath.Join(userDataDir(), userFile)
	- 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(u *writeas.AuthUser) error {
	- // Marshal struct into pretty-printed JSON
	- userJSON, err := json.MarshalIndent(u, "", " ")
	- if err != nil {
	- return err
	- }
	-
	- // Save file
	- err = ioutil.WriteFile(filepath.Join(userDataDir(), userFile), userJSON, 0600)
	- if err != nil {
	- return err
	- }
	- return nil
	-}
	diff --git a/cmd/writeas/commands.go b/commands/commands.go
	similarity index 54%
	rename from cmd/writeas/commands.go
	rename to commands/commands.go
	index 31dfe23..119b351 100644
	--- a/cmd/writeas/commands.go
	+++ b/commands/commands.go
	@@ -1,249 +1,251 @@
	-package main
	+package commands

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

	"github.com/howeyc/gopass"
	+ "github.com/writeas/writeas-cli/api"
	+ "github.com/writeas/writeas-cli/config"
	"github.com/writeas/writeas-cli/fileutils"
	+ "github.com/writeas/writeas-cli/log"
	cli "gopkg.in/urfave/cli.v1"
	)

	-func cmdPost(c *cli.Context) error {
	- _, err := handlePost(readStdIn(), c)
	+func CmdPost(c *cli.Context) error {
	+ _, err := api.HandlePost(api.ReadStdIn(), c)
	return err
	}

	-func cmdNew(c *cli.Context) error {
	- fname, p := composeNewPost()
	+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)
	}

	- InfolnQuit("Empty post. Bye!")
	+ log.InfolnQuit("Empty post. Bye!")
	}

	- _, err := handlePost(*p, c)
	+ _, err := api.HandlePost(*p, c)
	if err != nil {
	- Errorln("Error posting: %s", err)
	- Errorln(messageRetryCompose(fname))
	+ 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 {
	+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)
	+ p, err := api.HandlePost(content, c)
	if err != nil {
	return err
	}

	// Save post to posts folder
	- cfg, err := loadConfig()
	+ cfg, err := config.LoadConfig(config.UserDataDir())
	if cfg.Posts.Directory != "" {
	- err = WritePost(cfg.Posts.Directory, p)
	+ err = api.WritePost(cfg.Posts.Directory, p)
	if err != nil {
	return err
	}
	}
	return nil
	}

	-func cmdDelete(c *cli.Context) error {
	+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()
	+ u, _ := config.LoadUser(config.UserDataDir())
	if token == "" {
	// Search for the token locally
	- token = tokenFromID(friendlyID)
	+ token = api.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)
	+ 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 := isTor(c)
	+ tor := config.IsTor(c)
	if c.Int("tor-port") != 0 {
	- torPort = c.Int("tor-port")
	+ api.TorPort = c.Int("tor-port")
	}
	if tor {
	- Info(c, "Deleting via hidden service...")
	- } else if isDev() {
	- Info(c, "Deleting via dev environment...")
	+ log.Info(c, "Deleting via hidden service...")
	+ } else if config.IsDev() {
	+ log.Info(c, "Deleting via dev environment...")
	} else {
	- Info(c, "Deleting...")
	+ log.Info(c, "Deleting...")
	}

	- err := DoDelete(c, friendlyID, token, tor)
	+ err := api.DoDelete(c, friendlyID, token, tor)
	if err != nil {
	return err
	}

	// Delete local file, if necessary
	- cfg, err := loadConfig()
	+ cfg, err := config.LoadConfig(config.UserDataDir())
	if cfg.Posts.Directory != "" {
	// TODO: handle deleting blog posts
	- err = fileutils.DeleteFile(filepath.Join(cfg.Posts.Directory, friendlyID+postFileExt))
	+ err = fileutils.DeleteFile(filepath.Join(cfg.Posts.Directory, friendlyID+api.PostFileExt))
	if err != nil {
	return err
	}
	}

	return nil
	}

	-func cmdUpdate(c *cli.Context) error {
	+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()
	+ u, _ := config.LoadUser(config.UserDataDir())
	if token == "" {
	// Search for the token locally
	- token = tokenFromID(friendlyID)
	+ token = api.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)
	+ 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 := readStdIn()
	+ fullPost := api.ReadStdIn()

	- tor := isTor(c)
	+ tor := config.IsTor(c)
	if c.Int("tor-port") != 0 {
	- torPort = c.Int("tor-port")
	+ api.TorPort = c.Int("tor-port")
	}
	if tor {
	- Info(c, "Updating via hidden service...")
	- } else if isDev() {
	- Info(c, "Updating via dev environment...")
	+ log.Info(c, "Updating via hidden service...")
	+ } else if config.IsDev() {
	+ log.Info(c, "Updating via dev environment...")
	} else {
	- Info(c, "Updating...")
	+ log.Info(c, "Updating...")
	}

	- return DoUpdate(c, fullPost, friendlyID, token, c.String("font"), tor, c.Bool("code"))
	+ return api.DoUpdate(c, fullPost, friendlyID, token, c.String("font"), tor, c.Bool("code"))
	}

	-func cmdGet(c *cli.Context) error {
	+func CmdGet(c *cli.Context) error {
	friendlyID := c.Args().Get(0)
	if friendlyID == "" {
	return cli.NewExitError("usage: writeas get <postId>", 1)
	}

	- tor := isTor(c)
	+ tor := config.IsTor(c)
	if c.Int("tor-port") != 0 {
	- torPort = c.Int("tor-port")
	+ api.TorPort = c.Int("tor-port")
	}
	if tor {
	- Info(c, "Getting via hidden service...")
	- } else if isDev() {
	- Info(c, "Getting via dev environment...")
	+ log.Info(c, "Getting via hidden service...")
	+ } else if config.IsDev() {
	+ log.Info(c, "Getting via dev environment...")
	} else {
	- Info(c, "Getting...")
	+ log.Info(c, "Getting...")
	}

	- return DoFetch(friendlyID, userAgent(c), tor)
	+ return api.DoFetch(friendlyID, config.UserAgent(c), tor)
	}

	-func cmdAdd(c *cli.Context) error {
	+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)
	+ err := api.AddPost(friendlyID, token)
	return err
	}

	-func cmdList(c *cli.Context) error {
	+func CmdList(c *cli.Context) error {
	urls := c.Bool("url")
	ids := c.Bool("id")

	- var p Post
	- posts := getPosts()
	+ var p api.Post
	+ posts := api.GetPosts()
	for i := range *posts {
	p = (posts)[len(posts)-1-i]
	if ids \|\| !urls {
	fmt.Printf("%s ", p.ID)
	}
	if urls {
	- base := writeasBaseURL
	- if isDev() {
	- base = devBaseURL
	+ base := config.WriteasBaseURL
	+ if config.IsDev() {
	+ base = config.DevBaseURL
	}
	ext := ""
	// Output URL in requested format
	if c.Bool("md") {
	ext = ".md"
	}
	fmt.Printf("%s/%s%s ", base, p.ID, ext)
	}
	fmt.Print("\n")
	}
	return nil
	}

	-func cmdAuth(c *cli.Context) error {
	+func CmdAuth(c *cli.Context) error {
	// Check configuration
	- u, err := loadUser()
	+ u, err := config.LoadUser(config.UserDataDir())
	if err != nil {
	return cli.NewExitError(fmt.Sprintf("couldn't load config: %v", err), 1)
	}
	if u != nil && u.AccessToken != "" {
	return cli.NewExitError("You're already authenticated as "+u.User.Username+". Log out with: writeas logout", 1)
	}

	// Validate arguments and get password
	username := c.Args().Get(0)
	if username == "" {
	return cli.NewExitError("usage: writeas auth <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))
	+ return api.DoLogIn(c, username, string(pass))
	}

	-func cmdLogOut(c *cli.Context) error {
	- return DoLogOut(c)
	+func CmdLogOut(c *cli.Context) error {
	+ return api.DoLogOut(c)
	}
	diff --git a/config/build.go b/config/build.go
	new file mode 100644
	index 0000000..1ca1c10
	--- /dev/null
	+++ b/config/build.go
	@@ -0,0 +1,7 @@
	+// +build !debug
	+
	+package config
	+
	+func Debug() bool {
	+ return false
	+}
	diff --git a/config/build_debug.go b/config/build_debug.go
	new file mode 100644
	index 0000000..b08138d
	--- /dev/null
	+++ b/config/build_debug.go
	@@ -0,0 +1,7 @@
	+// +build debug
	+
	+package config
	+
	+func Debug() bool {
	+ return true
	+}
	diff --git a/config/config.go b/config/config.go
	new file mode 100644
	index 0000000..4c9c59d
	--- /dev/null
	+++ b/config/config.go
	@@ -0,0 +1,63 @@
	+package config
	+
	+import (
	+ "os"
	+ "path/filepath"
	+
	+ ini "gopkg.in/ini.v1"
	+)
	+
	+const (
	+ UserConfigFile = "config.ini"
	+)
	+
	+type (
	+ APIConfig struct {
	+ }
	+
	+ PostsConfig struct {
	+ Directory string `ini:"directory"`
	+ }
	+
	+ UserConfig struct {
	+ API APIConfig `ini:"api"`
	+ Posts PostsConfig `ini:"posts"`
	+ }
	+)
	+
	+func LoadConfig(dataDir string) (*UserConfig, error) {
	+ // TODO: load config to var shared across app
	+ cfg, err := ini.LooseLoad(filepath.Join(dataDir, UserConfigFile))
	+ if err != nil {
	+ return nil, err
	+ }
	+
	+ // Parse INI file
	+ uc := &UserConfig{}
	+ err = cfg.MapTo(uc)
	+ if err != nil {
	+ return nil, err
	+ }
	+ return uc, nil
	+}
	+
	+func SaveConfig(dataDir string, uc *UserConfig) error {
	+ cfg := ini.Empty()
	+ err := ini.ReflectFrom(cfg, uc)
	+ if err != nil {
	+ return err
	+ }
	+
	+ return cfg.SaveTo(filepath.Join(dataDir, UserConfigFile))
	+}
	+
	+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/cmd/writeas/dev.go b/config/dev.go
	similarity index 63%
	rename from cmd/writeas/dev.go
	rename to config/dev.go
	index a290838..41dbf5a 100644
	--- a/cmd/writeas/dev.go
	+++ b/config/dev.go
	@@ -1,9 +1,9 @@
	-package main
	+package config

	import (
	"os"
	)

	-func isDev() bool {
	+func IsDev() bool {
	return os.Getenv("WRITEAS_DEV") == "1"
	}
	diff --git a/config/directories.go b/config/directories.go
	new file mode 100644
	index 0000000..9031489
	--- /dev/null
	+++ b/config/directories.go
	@@ -0,0 +1,20 @@
	+package config
	+
	+import (
	+ "os"
	+ "path/filepath"
	+
	+ "github.com/writeas/writeas-cli/fileutils"
	+)
	+
	+func UserDataDir() string {
	+ return filepath.Join(parentDataDir(), dataDirName)
	+}
	+
	+func DataDirExists() bool {
	+ return fileutils.Exists(UserDataDir())
	+}
	+
	+func CreateDataDir() error {
	+ return os.Mkdir(UserDataDir(), 0700)
	+}
	diff --git a/cmd/writeas/posts_nix.go b/config/files_nix.go
	similarity index 74%
	rename from cmd/writeas/posts_nix.go
	rename to config/files_nix.go
	index 52fbae5..8c669d3 100644
	--- a/cmd/writeas/posts_nix.go
	+++ b/config/files_nix.go
	@@ -1,44 +1,44 @@
	// +build !windows

	-package main
	+package config

	import (
	"fmt"
	"os/exec"

	homedir "github.com/mitchellh/go-homedir"
	)

	const (
	dataDirName = ".writeas"
	- noEditorErr = "Couldn't find default editor. Try setting $EDITOR environment variable in ~/.profile"
	+ NoEditorErr = "Couldn't find default editor. Try setting $EDITOR environment variable in ~/.profile"
	)

	func parentDataDir() string {
	dir, err := homedir.Dir()
	if err != nil {
	panic(err)
	}

	return dir
	}

	-func editPostCmd(fname string) *exec.Cmd {
	- editor := getConfiguredEditor()
	+func EditPostCmd(fname string) *exec.Cmd {
	+ editor := GetConfiguredEditor()
	if editor == "" {
	// Fall back to default editor
	path, err := exec.LookPath("vim")
	if err != nil {
	path, err = exec.LookPath("nano")
	if err != nil {
	return nil
	}
	}
	editor = path
	}
	return exec.Command(editor, fname)
	}

	-func messageRetryCompose(fname string) string {
	+func MessageRetryCompose(fname string) string {
	return fmt.Sprintf("To retry this post, run:\n cat %s \| writeas", fname)
	}
	diff --git a/cmd/writeas/posts_win.go b/config/files_win.go
	similarity index 69%
	rename from cmd/writeas/posts_win.go
	rename to config/files_win.go
	index c8b080a..cf478f1 100644
	--- a/cmd/writeas/posts_win.go
	+++ b/config/files_win.go
	@@ -1,27 +1,27 @@
	// +build windows

	-package main
	+package config

	import (
	"fmt"
	"os"
	"os/exec"
	)

	const (
	dataDirName = "Write.as"
	- noEditorErr = "Error getting default editor. You shouldn't see this, so let us know you did: hello@write.as"
	+ NoEditorErr = "Error getting default editor. You shouldn't see this, so let us know you did: hello@write.as"
	)

	func parentDataDir() string {
	return os.Getenv("APPDATA")
	}

	-func editPostCmd(fname string) *exec.Cmd {
	+func EditPostCmd(fname string) *exec.Cmd {
	// NOTE this won't work if fname contains spaces.
	return exec.Command("cmd", "/C copy con "+fname)
	}

	-func messageRetryCompose(fname string) string {
	+func MessageRetryCompose(fname string) string {
	return fmt.Sprintf("To retry this post, run:\n type %s \| writeas.exe", fname)
	}
	diff --git a/config/flags.go b/config/flags.go
	new file mode 100644
	index 0000000..2c17e23
	--- /dev/null
	+++ b/config/flags.go
	@@ -0,0 +1,50 @@
	+package config
	+
	+import (
	+ "gopkg.in/urfave/cli.v1"
	+)
	+
	+// 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: "md",
	+ Usage: "Returns post URL with Markdown enabled",
	+ },
	+ 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: "",
	+ },
	+}
	diff --git a/cmd/writeas/fonts.go b/config/fonts.go
	similarity index 81%
	rename from cmd/writeas/fonts.go
	rename to config/fonts.go
	index 28684e9..22fc56b 100644
	--- a/cmd/writeas/fonts.go
	+++ b/config/fonts.go
	@@ -1,46 +1,46 @@
	-package main
	+package config

	import (
	"fmt"
	)

	// postFont represents a valid post appearance value in the API.
	type postFont string

	// Valid appearance types for posts.
	const (
	PostFontNormal postFont = "norm"
	PostFontSans = "sans"
	PostFontMono = "mono"
	PostFontWrap = "wrap"
	PostFontCode = "code"
	)

	var postFontMap = map[string]postFont{
	"norm": PostFontNormal,
	"normal": PostFontNormal,
	"serif": PostFontNormal,
	"sans": PostFontSans,
	"sansserif": PostFontSans,
	"mono": PostFontMono,
	"monospace": PostFontMono,
	"wrap": PostFontWrap,
	"code": PostFontCode,
	}

	-func getFont(code bool, font string) string {
	+func GetFont(code bool, font string) string {
	if code {
	- if font != "" && font != defaultFont {
	+ if font != "" && font != DefaultFont {
	fmt.Printf("A non-default font '%s' and --code flag given. 'code' type takes precedence.\n", font)
	}
	return "code"
	}

	// Validate font value
	if f, ok := postFontMap[font]; ok {
	return string(f)
	}

	- fmt.Printf("Font '%s' invalid. Using default '%s'\n", font, defaultFont)
	- return string(defaultFont)
	+ fmt.Printf("Font '%s' invalid. Using default '%s'\n", font, DefaultFont)
	+ return string(DefaultFont)
	}
	diff --git a/config/options.go b/config/options.go
	new file mode 100644
	index 0000000..9b717bd
	--- /dev/null
	+++ b/config/options.go
	@@ -0,0 +1,56 @@
	+package config
	+
	+import (
	+ "github.com/cloudfoundry/jibber_jabber"
	+ "github.com/writeas/writeas-cli/log"
	+ cli "gopkg.in/urfave/cli.v1"
	+)
	+
	+// Application constants.
	+const (
	+ Version = "1.99-dev"
	+ defaultUserAgent = "writeas-cli v" + Version
	+ // 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 ua + " (" + defaultUserAgent + ")"
	+}
	+
	+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 ""
	+}
	diff --git a/config/user.go b/config/user.go
	new file mode 100644
	index 0000000..d7039f1
	--- /dev/null
	+++ b/config/user.go
	@@ -0,0 +1,47 @@
	+package config
	+
	+import (
	+ "encoding/json"
	+ "io/ioutil"
	+ "path/filepath"
	+
	+ "github.com/writeas/writeas-cli/fileutils"
	+ "go.code.as/writeas.v2"
	+)
	+
	+const UserFile = "user.json"
	+
	+func LoadUser(dataDir string) (*writeas.AuthUser, error) {
	+ fname := filepath.Join(dataDir, UserFile)
	+ 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 {
	+ // Marshal struct into pretty-printed JSON
	+ userJSON, err := json.MarshalIndent(u, "", " ")
	+ if err != nil {
	+ return err
	+ }
	+
	+ // Save file
	+ err = ioutil.WriteFile(filepath.Join(dataDir, UserFile), userJSON, 0600)
	+ if err != nil {
	+ return err
	+ }
	+ return nil
	+}
	diff --git a/go.mod b/go.mod
	index a416f43..ec850e6 100644
	--- a/go.mod
	+++ b/go.mod
	@@ -1,24 +1,26 @@
	module github.com/writeas/writeas-cli

	require (
	code.as/core/socks v0.0.0-20180906144846-5be269b4e664
	github.com/atotto/clipboard v0.1.1
	github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21
	github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
	github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c
	github.com/jtolds/gls v4.2.1+incompatible // indirect
	github.com/microcosm-cc/bluemonday v1.0.1 // indirect
	github.com/mitchellh/go-homedir v1.0.0
	+ github.com/onsi/ginkgo v1.8.0 // indirect
	+ github.com/onsi/gomega v1.5.0 // indirect
	github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95 // indirect
	github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d // indirect
	github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c // indirect
	github.com/writeas/impart v0.0.0-20180808220913-fef51864677b // indirect
	github.com/writeas/saturday v0.0.0-20170402010311-f455b05c043f // indirect
	github.com/writeas/web-core v0.0.0-20181111165528-05f387ffa1b3
	go.code.as/writeas.v2 v0.0.0-20181216235156-68cbee8f4a5e
	golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 // indirect
	golang.org/x/net v0.0.0-20181217023233-e147a9138326 // indirect
	golang.org/x/sys v0.0.0-20181213200352-4d1cda033e06 // indirect
	gopkg.in/ini.v1 v1.39.3
	gopkg.in/urfave/cli.v1 v1.20.0
	)
	diff --git a/go.sum b/go.sum
	index 11512e2..9662d3c 100644
	--- a/go.sum
	+++ b/go.sum
	@@ -1,40 +1,61 @@
	code.as/core/socks v0.0.0-20180906144846-5be269b4e664 h1:zWSFbwkYSuZ2PjvHqYDE/dhd9CCcsbSvUIRx8hIed3I=
	code.as/core/socks v0.0.0-20180906144846-5be269b4e664/go.mod h1:BAXBy5O9s2gmw6UxLqNJcVbWY7C/UPs+801CcSsfWOY=
	github.com/atotto/clipboard v0.1.1 h1:WSoEbAS70E5gw8FbiqFlp69MGsB6dUb4l+0AGGLiVGw=
	github.com/atotto/clipboard v0.1.1/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
	github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 h1:tuijfIjZyjZaHq9xDUh0tNitwXshJpbLkqMOJv4H3do=
	github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21/go.mod h1:po7NpZ/QiTKzBKyrsEAxwnTamCoh8uDk/egRpQ7siIc=
	+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
	+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
	github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg=
	github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
	github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c h1:kQWxfPIHVLbgLzphqk3QUflDy9QdksZR4ygR807bpy0=
	github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs=
	+github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
	+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
	github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE=
	github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
	github.com/microcosm-cc/bluemonday v1.0.1 h1:SIYunPjnlXcW+gVfvm0IlSeR5U3WZUOLfVmqg85Go44=
	github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
	github.com/mitchellh/go-homedir v1.0.0 h1:vKb8ShqSby24Yrqr/yDYkuFz8d0WUjys40rvnGC8aR0=
	github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
	+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
	+github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w=
	+github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
	+github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
	+github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
	github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95 h1:/vdW8Cb7EXrkqWGufVMES1OH2sU9gKVb2n9/1y5NMBY=
	github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
	github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
	github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
	github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c h1:Ho+uVpkel/udgjbwB5Lktg9BtvJSh2DT0Hi6LPSyI2w=
	github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
	github.com/writeas/impart v0.0.0-20180808220913-fef51864677b h1:vsZIsYneuNwXMsnh0lKviEVc8WeIqBG4RTmGWU86HpI=
	github.com/writeas/impart v0.0.0-20180808220913-fef51864677b/go.mod h1:sUkQZZHJfrVNsoD4QbkrYrRSQtCN3SaUPWKdohmFKT8=
	github.com/writeas/saturday v0.0.0-20170402010311-f455b05c043f h1:yyFguE0EopK8e7I7/AB1JWM925OFOI1uFhTM/SwXAnQ=
	github.com/writeas/saturday v0.0.0-20170402010311-f455b05c043f/go.mod h1:ETE1EK6ogxptJpAgUbcJD0prAtX48bSloie80+tvnzQ=
	github.com/writeas/web-core v0.0.0-20181111165528-05f387ffa1b3 h1:mKD4DMZuiZWrn1k/f+1wLmBu9SYMrydy9om+eeo9kjA=
	github.com/writeas/web-core v0.0.0-20181111165528-05f387ffa1b3/go.mod h1:Si3chV7VWgY8CsV+3gRolMXSO2Vx1ZFAQ/mkrpvmyEE=
	go.code.as/writeas.v2 v0.0.0-20181216235156-68cbee8f4a5e h1:emU11ZqEW7s+6/Ty52t0lQ9c3Mg+c97YSwswUeSpsG8=
	go.code.as/writeas.v2 v0.0.0-20181216235156-68cbee8f4a5e/go.mod h1:wH0YOXh4B2fcSJ/ihy+qru0XfCdGb4CPKaO0qS2g47k=
	golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 h1:mKdxBk7AujPs8kU4m80U72y/zjbZ3UcXC7dClwKbUI0=
	golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
	+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
	golang.org/x/net v0.0.0-20181217023233-e147a9138326 h1:iCzOf0xz39Tstp+Tu/WwyGjUXCk34QhQORRxBeXXTA4=
	golang.org/x/net v0.0.0-20181217023233-e147a9138326/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
	+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
	+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
	golang.org/x/sys v0.0.0-20181213200352-4d1cda033e06 h1:0oC8rFnE+74kEmuHZ46F6KHsMr5Gx2gUQPuNz28iQZM=
	golang.org/x/sys v0.0.0-20181213200352-4d1cda033e06/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
	+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
	+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
	+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
	+gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
	+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
	gopkg.in/ini.v1 v1.39.3 h1:+LGDwGPQXrK1zLmDY5GMdgX7uNvs4iS+9fIRAGaDBbg=
	gopkg.in/ini.v1 v1.39.3/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
	+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
	+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
	gopkg.in/urfave/cli.v1 v1.20.0 h1:NdAVW6RYxDif9DhDHaAortIu956m2c0v+09AZBPTbE0=
	gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0=
	+gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
	+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
	diff --git a/cmd/writeas/errors.go b/log/errors.go
	similarity index 66%
	rename from cmd/writeas/errors.go
	rename to log/errors.go
	index 9acc555..8ce959f 100644
	--- a/cmd/writeas/errors.go
	+++ b/log/errors.go
	@@ -1,9 +1,10 @@
	-package main
	+package log

	import (
	"errors"
	)

	+// TODO: this is never used?
	var (
	ErrPostNotFound = errors.New("Post not found.")
	)
	diff --git a/cmd/writeas/logging.go b/log/logging.go
	similarity index 93%
	rename from cmd/writeas/logging.go
	rename to log/logging.go
	index 988209c..a514a7c 100644
	--- a/cmd/writeas/logging.go
	+++ b/log/logging.go
	@@ -1,33 +1,33 @@
	-package main
	+package log

	import (
	"fmt"
	"os"

	cli "gopkg.in/urfave/cli.v1"
	)

	// 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
	+// Errorln logs the message to stderr
	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)
	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Nov 24, 6:26 PM (17 h, 20 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 3106335

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions