No OneTemporary
Actions

Size

20 KB

Subscribers

None

View Options

	diff --git a/cmd/writeas/cli.go b/cmd/writeas/cli.go
	index 6092688..f99a0b3 100644
	--- a/cmd/writeas/cli.go
	+++ b/cmd/writeas/cli.go
	@@ -1,359 +1,383 @@
	package main

	import (
	"bufio"
	"go.code.as/writeas.v2"
	"gopkg.in/urfave/cli.v1"
	"io"
	"log"
	"os"
	)

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

	// Application constants.
	const (
	version = "1.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.Usage = "Publish text quickly"
	app.Authors = []cli.Author{
	{
	Name: "Write.as",
	Email: "hello@write.as",
	},
	}
	app.Action = cmdPost
	app.Flags = postFlags
	app.Commands = []cli.Command{
	{
	Name: "post",
	Usage: "Alias for default action: create post from stdin",
	Action: cmdPost,
	Flags: postFlags,
	Description: `Create a new post on Write.as from stdin.

	Use the --code flag to indicate that the post should use syntax
	highlighting. Or use the --font [value] argument to set the post's
	appearance, where [value] is mono, monospace (default), wrap (monospace
	font with word wrapping), serif, or sans.`,
	},
	{
	Name: "new",
	Usage: "Compose a new post from the command-line and publish",
	Description: `An alternative to piping data to the program.

	On Windows, this will use 'copy con' to start reading what you input from the
	prompt. Press F6 or Ctrl-Z then Enter to end input.
	On *nix, this will use the best available text editor, starting with the
	value set to the WRITAS_EDITOR or EDITOR environment variable, or vim, or
	finally nano.

	Use the --code flag to indicate that the post should use syntax
	highlighting. Or use the --font [value] argument to set the post's
	appearance, where [value] is mono, monospace (default), wrap (monospace
	font with word wrapping), serif, or sans.

	If posting fails for any reason, 'writeas' will show you the temporary file
	location and how to pipe it to 'writeas' to retry.`,
	Action: cmdNew,
	Flags: postFlags,
	},
	{
	Name: "publish",
	Usage: "Publish a file to Write.as",
	Action: cmdPublish,
	Flags: postFlags,
	},
	{
	Name: "delete",
	Usage: "Delete a post",
	Action: cmdDelete,
	Flags: []cli.Flag{
	cli.BoolFlag{
	Name: "tor, t",
	Usage: "Delete via Tor hidden service",
	},
	cli.IntFlag{
	Name: "tor-port",
	Usage: "Use a different port to connect to Tor",
	Value: 9150,
	},
	cli.BoolFlag{
	Name: "verbose, v",
	Usage: "Make the operation more talkative",
	},
	},
	},
	{
	Name: "update",
	Usage: "Update (overwrite) a post",
	Action: cmdUpdate,
	Flags: []cli.Flag{
	cli.BoolFlag{
	Name: "tor, t",
	Usage: "Update via Tor hidden service",
	},
	cli.IntFlag{
	Name: "tor-port",
	Usage: "Use a different port to connect to Tor",
	Value: 9150,
	},
	cli.BoolFlag{
	Name: "code",
	Usage: "Specifies this post is code",
	},
	cli.StringFlag{
	Name: "font",
	Usage: "Sets post font to given value",
	},
	cli.BoolFlag{
	Name: "verbose, v",
	Usage: "Make the operation more talkative",
	},
	},
	},
	{
	Name: "get",
	Usage: "Read a raw post",
	Action: cmdGet,
	Flags: []cli.Flag{
	cli.BoolFlag{
	Name: "tor, t",
	Usage: "Get from Tor hidden service",
	},
	cli.IntFlag{
	Name: "tor-port",
	Usage: "Use a different port to connect to Tor",
	Value: 9150,
	},
	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,
	},
	{
	Name: "list",
	Usage: "List local posts",
	Action: cmdList,
	Flags: []cli.Flag{
	cli.BoolFlag{
	Name: "id",
	Usage: "Show list with post IDs (default)",
	},
	cli.BoolFlag{
	Name: "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,
	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,
	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,
	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: "config",
	+ Usage: "Get and set options",
	+ UsageText: "config name [value]\n writeas config [command options]",
	+ Action: cmdOptions,
	+ Flags: []cli.Flag{
	+ cli.BoolFlag{
	+ Name: "edit, e",
	+ Usage: "Opens an editor to modify the config file",
	+ },
	+ cli.BoolFlag{
	+ Name: "list, l",
	+ Usage: "List all variables set in config file, along with their values",
	+ },
	+ cli.BoolFlag{
	+ Name: "list-all, a",
	+ Usage: "List all config variables, along with their values",
	+ },
	+ 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}}
	+ writeas {{if .UsageText}}{{.UsageText}}{{else}}{{.Name}}{{if .Flags}} [command options]{{end}} [arguments...]{{end}}{{if .Description}}

	DESCRIPTION:
	{{.Description}}{{end}}{{if .Flags}}

	OPTIONS:
	{{range .Flags}}{{.}}
	{{end}}{{ end }}
	`

	app.Run(os.Args)
	}

	func initialize() {
	// Ensure we have a data directory to use
	if !dataDirExists() {
	createDataDir()
	}
	}

	func readStdIn() []byte {
	numBytes, numChunks := int64(0), int64(0)
	r := bufio.NewReader(os.Stdin)
	fullPost := []byte{}
	buf := make([]byte, 0, 1024)
	for {
	n, err := r.Read(buf[:cap(buf)])
	buf = buf[:n]
	if n == 0 {
	if err == nil {
	continue
	}
	if err == io.EOF {
	break
	}
	log.Fatal(err)
	}
	numChunks++
	numBytes += int64(len(buf))

	fullPost = append(fullPost, buf...)
	if err != nil && err != io.EOF {
	log.Fatal(err)
	}
	}

	return fullPost
	}

	func handlePost(fullPost []byte, c cli.Context) (writeas.Post, error) {
	tor := isTor(c)
	if c.Int("tor-port") != 0 {
	torPort = c.Int("tor-port")
	}
	if tor {
	Info(c, "Posting to hidden service...")
	} else {
	Info(c, "Posting...")
	}

	return DoPost(c, fullPost, c.String("font"), false, tor, c.Bool("code"))
	}
	diff --git a/cmd/writeas/commands.go b/cmd/writeas/commands.go
	index 20e2b7c..941e8d9 100644
	--- a/cmd/writeas/commands.go
	+++ b/cmd/writeas/commands.go
	@@ -1,242 +1,319 @@
	package main

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

	func cmdPost(c *cli.Context) error {
	_, err := handlePost(readStdIn(), c)
	return err
	}

	func cmdNew(c *cli.Context) error {
	fname, p := composeNewPost()
	if p == nil {
	// Assume composeNewPost already told us what the error was. Abort now.
	os.Exit(1)
	}

	// Ensure we have something to post
	if len(*p) == 0 {
	// Clean up temporary post
	if fname != "" {
	os.Remove(fname)
	}

	InfolnQuit("Empty post. Bye!")
	}

	_, err := handlePost(*p, c)
	if err != nil {
	Errorln("Error posting: %s", err)
	Errorln(messageRetryCompose(fname))
	return cli.NewExitError("", 1)
	}

	// Clean up temporary post
	if fname != "" {
	os.Remove(fname)
	}

	return nil
	}

	func cmdPublish(c *cli.Context) error {
	filename := c.Args().Get(0)
	if filename == "" {
	return cli.NewExitError("usage: writeas publish <filename>", 1)
	}
	content, err := ioutil.ReadFile(filename)
	if err != nil {
	return err
	}
	p, err := handlePost(content, c)
	if err != nil {
	return err
	}

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

	func cmdDelete(c *cli.Context) error {
	friendlyID := c.Args().Get(0)
	token := c.Args().Get(1)
	if friendlyID == "" {
	return cli.NewExitError("usage: writeas delete <postId> [<token>]", 1)
	}

	u, _ := loadUser()
	if token == "" {
	// Search for the token locally
	token = tokenFromID(friendlyID)
	if token == "" && u == nil {
	Errorln("Couldn't find an edit token locally. Did you create this post here?")
	ErrorlnQuit("If you have an edit token, use: writeas delete %s <token>", friendlyID)
	}
	}

	tor := isTor(c)
	if c.Int("tor-port") != 0 {
	torPort = c.Int("tor-port")
	}
	if tor {
	Info(c, "Deleting via hidden service...")
	} else {
	Info(c, "Deleting...")
	}

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

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

	return nil
	}

	func cmdUpdate(c *cli.Context) error {
	friendlyID := c.Args().Get(0)
	token := c.Args().Get(1)
	if friendlyID == "" {
	return cli.NewExitError("usage: writeas update <postId> [<token>]", 1)
	}

	u, _ := loadUser()
	if token == "" {
	// Search for the token locally
	token = tokenFromID(friendlyID)
	if token == "" && u == nil {
	Errorln("Couldn't find an edit token locally. Did you create this post here?")
	ErrorlnQuit("If you have an edit token, use: writeas update %s <token>", friendlyID)
	}
	}

	// Read post body
	fullPost := readStdIn()

	tor := isTor(c)
	if c.Int("tor-port") != 0 {
	torPort = c.Int("tor-port")
	}
	if tor {
	Info(c, "Updating via hidden service...")
	} else {
	Info(c, "Updating...")
	}

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

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

	tor := isTor(c)
	if c.Int("tor-port") != 0 {
	torPort = c.Int("tor-port")
	}
	if tor {
	Info(c, "Getting via hidden service...")
	} else {
	Info(c, "Getting...")
	}

	return DoFetch(friendlyID, userAgent(c), tor)
	}

	func cmdAdd(c *cli.Context) error {
	friendlyID := c.Args().Get(0)
	token := c.Args().Get(1)
	if friendlyID == "" \|\| token == "" {
	return cli.NewExitError("usage: writeas add <postId> <token>", 1)
	}

	err := addPost(friendlyID, token)
	return err
	}

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

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

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

	// Validate arguments and get password
	username := c.Args().Get(0)
	if username == "" {
	return cli.NewExitError("usage: writeas auth <username>", 1)
	}

	fmt.Print("Password: ")
	pass, err := gopass.GetPasswdMasked()
	if err != nil {
	return cli.NewExitError(fmt.Sprintf("error reading password: %v", err), 1)
	}

	// Validate password
	if len(pass) == 0 {
	return cli.NewExitError("Please enter your password.", 1)
	}
	return DoLogIn(c, username, string(pass))
	}

	func cmdLogOut(c *cli.Context) error {
	return DoLogOut(c)
	}
	+
	+func cmdOptions(c *cli.Context) error {
	+
	+ // Edit config file
	+ if c.Bool("e") {
	+ composeConfig()
	+
	+ // List configs
	+ } else if c.Bool("l") \|\| c.Bool("a") {
	+ uc, err := loadConfig()
	+ if err != nil {
	+ ErrorlnQuit(fmt.Sprintf("Error loading config: %v", err), 1)
	+ }
	+ printConfig(uc, "", c.Bool("a"))
	+
	+ // Check arguments
	+ } else {
	+ nargs := len(c.Args())
	+
	+ // No arguments nor options: display command usage
	+ if nargs == 0 {
	+ cli.ShowSubcommandHelp(c)
	+ return nil
	+ }
	+ name := c.Args().Get(0)
	+ value := c.Args().Get(1)
	+
	+ // Load config file
	+ uc, err := loadConfig()
	+ if err != nil {
	+ ErrorlnQuit(fmt.Sprintf("Error loading config: %v", err), 1)
	+ }
	+
	+ // Get reflection of field
	+ rval, err := getConfigField(uc, name)
	+ if err != nil {
	+ ErrorlnQuit(fmt.Sprintf("%v", err), 1)
	+ }
	+
	+ // Print value
	+ if nargs == 1 {
	+ fmt.Printf("%s=%v\n", name, *rval)
	+
	+ // Set value
	+ } else {
	+
	+ // Cast and set value
	+ switch typ := rval.Kind().String(); typ {
	+ case "bool":
	+ b, err := strconv.ParseBool(value)
	+ if err != nil {
	+ ErrorlnQuit(fmt.Sprintf("error: \"%s\" is not a valid boolean", value), 1)
	+ }
	+ rval.SetBool(b)
	+
	+ case "int":
	+ i, err := strconv.ParseInt(value, 0, 0)
	+ if err != nil {
	+ ErrorlnQuit(fmt.Sprintf("error: \"%s\" is not a valid integer", value), 1)
	+ }
	+ rval.SetInt(i)
	+
	+ case "string":
	+ rval.SetString(value)
	+ }
	+
	+ // Save config to file
	+ err = saveConfig(uc)
	+ if err != nil {
	+ ErrorlnQuit(fmt.Sprintf("Unable to save config: %s", err), 1)
	+ }
	+ fmt.Println("Saved config.")
	+ }
	+ }
	+ return nil
	+}
	diff --git a/cmd/writeas/userconfig.go b/cmd/writeas/userconfig.go
	index e904dff..b3d35f2 100644
	--- a/cmd/writeas/userconfig.go
	+++ b/cmd/writeas/userconfig.go
	@@ -1,90 +1,188 @@
	package main

	import (
	"encoding/json"
	"github.com/writeas/writeas-cli/fileutils"
	"go.code.as/writeas.v2"
	"gopkg.in/ini.v1"
	"io/ioutil"
	"path/filepath"
	+ "reflect"
	+ "fmt"
	+ "os"
	+ "strings"
	)

	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
	}
	+
	+// Prints all values of the given struct
	+// For subfields: the field name is separated with dots (ex: Posts.Directory=)
	+func printConfig(x interface{}, prefix string, showEmptyValues bool) {
	+ values := reflect.ValueOf(x)
	+
	+ if values.Kind() == reflect.Ptr {
	+ values = values.Elem()
	+ }
	+ typ := values.Type()
	+
	+ for i := 0; i < typ.NumField(); i++ {
	+ val := values.Field(i)
	+ name := typ.Field(i).Name
	+
	+ if prefix != "" {
	+ name = prefix + "." + name
	+ }
	+ if(val.Kind() == reflect.Struct) {
	+ printConfig(val.Interface(), name, showEmptyValues)
	+ } else {
	+ if showEmptyValues \|\| val.Interface() != reflect.Zero(val.Type()).Interface() {
	+ fmt.Printf("%s=%v\n", name, val)
	+ }
	+ }
	+ }
	+}
	+
	+// Get the value of a given field
	+// For subfields: the name should be separated with dots (ex: Posts.Directory)
	+func getConfigField(x interface{}, name string) (*reflect.Value, error) {
	+ path := strings.Split(name, ".")
	+ values := reflect.ValueOf(x)
	+
	+ if values.Kind() == reflect.Ptr {
	+ values = values.Elem()
	+ }
	+ for _, part := range path {
	+ values = values.FieldByName(part)
	+
	+ if !values.IsValid() {
	+ err := fmt.Errorf("error: key does not contain a section: %v", name)
	+ return nil, err
	+ }
	+ }
	+ if values.Kind() == reflect.Struct {
	+ err := fmt.Errorf("error: key does not contain a section: %v", name)
	+ return nil, err
	+ }
	+ return &values, nil
	+}
	+
	+// Opens an editor to modify the config file
	+func composeConfig() error {
	+ filename := filepath.Join(userDataDir(), userConfigFile)
	+
	+ // Open the editor
	+ cmd := editPostCmd(filename)
	+ if cmd == nil {
	+ fmt.Println(noEditorErr)
	+ return nil
	+ }
	+ cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
	+ if err := cmd.Start(); err != nil {
	+ if debug {
	+ panic(err)
	+ } else {
	+ Errorln("Error starting editor: %s", err)
	+ return nil
	+ }
	+ }
	+
	+ // Wait until the editor is closed
	+ if err := cmd.Wait(); err != nil {
	+ if debug {
	+ panic(err)
	+ } else {
	+ Errorln("Editor finished with error: %s", err)
	+ return nil
	+ }
	+ }
	+
	+ // Check if the config file is valid
	+ _, err := loadConfig()
	+ if err != nil {
	+ if debug {
	+ panic(err)
	+ } else {
	+ Errorln("Error loading config: %s", err)
	+ return nil
	+ }
	+ }
	+ return nil
	+}

File Metadata

Mime Type: text/x-diff
Expires: Sat, Jan 31, 9:40 AM (1 d, 2 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 3612205

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions