No OneTemporary
Actions

Size

17 KB

Subscribers

None

View Options

	diff --git a/utils/fileutils.go b/utils/fileutils.go
	index 4686606..ba36356 100644
	--- a/utils/fileutils.go
	+++ b/utils/fileutils.go
	@@ -1,101 +1,107 @@
	package fileutils

	import (
	"bufio"
	"fmt"
	"os"
	"strings"
	)

	// Exists returns whether or not the given file exists
	func Exists(p string) bool {
	if _, err := os.Stat(p); err == nil {
	return true
	}
	return false
	}

	+// WriteData writes data to the given path, creating the file if necessary.
	func WriteData(path string, data []byte) {
	f, err := os.OpenFile(path, os.O_CREATE\|os.O_WRONLY\|os.O_TRUNC, 0600)
	if err != nil {
	fmt.Println(err)
	}
	// TODO: check for Close() errors
	// https://github.com/ncw/swift/blob/master/swift.go#L170
	defer f.Close()

	_, err = f.Write(data)
	if err != nil {
	fmt.Println(err)
	}
	}

	+// ReadData returns file data as an array of lines from the file.
	func ReadData(p string) *[]string {
	f, err := os.Open(p)
	if err != nil {
	return nil
	}
	defer f.Close()

	lines := []string{}

	scanner := bufio.NewScanner(f)
	for scanner.Scan() {
	lines = append(lines, scanner.Text())
	}

	if err := scanner.Err(); err != nil {
	return nil
	}

	return &lines
	}

	+// RemoveLine searches for the line that starts with the given value and,
	+// if found, removes it and saves the updated file.
	func RemoveLine(p, startsWith string) {
	f, err := os.Open(p)
	if err != nil {
	return
	}
	defer f.Close()

	var outText string
	found := false

	scanner := bufio.NewScanner(f)
	for scanner.Scan() {
	if strings.HasPrefix(scanner.Text(), startsWith) {
	found = true
	} else {
	outText += scanner.Text() + string('\n')
	}
	}

	if err := scanner.Err(); err != nil {
	return
	}

	if found {
	WriteData(p, []byte(outText))
	}
	}

	+// FindLine searches the given file for a line that begins with the given
	+// string.
	func FindLine(p, startsWith string) string {
	f, err := os.Open(p)
	if err != nil {
	return ""
	}
	defer f.Close()

	scanner := bufio.NewScanner(f)
	for scanner.Scan() {
	if strings.HasPrefix(scanner.Text(), startsWith) {
	return scanner.Text()
	}
	}

	if err := scanner.Err(); err != nil {
	return ""
	}

	return ""
	}
	diff --git a/writeas/cli.go b/writeas/cli.go
	index f0480ba..4f7db7c 100644
	--- a/writeas/cli.go
	+++ b/writeas/cli.go
	@@ -1,420 +1,425 @@
	package main

	import (
	"bufio"
	"bytes"
	- "errors"
	"fmt"
	"github.com/atotto/clipboard"
	"github.com/codegangsta/cli"
	"io"
	"io/ioutil"
	"log"
	"net/http"
	"net/url"
	"os"
	"strconv"
	"strings"
	)

	// API constants for communicating with Write.as.
	const (
	- apiUrl = "https://write.as"
	- hiddenApiUrl = "http://writeas7pm7rcdqg.onion"
	- readApiUrl = "https://write.as"
	+ apiURL = "https://write.as"
	+ hiddenAPIURL = "http://writeas7pm7rcdqg.onion"
	+ readAPIURL = "https://write.as"
	)

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

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

	// Available flags for creating posts
	var postFlags = []cli.Flag{
	cli.BoolFlag{
	Name: "tor, t",
	Usage: "Perform action on Tor hidden service",
	},
	cli.IntFlag{
	Name: "tor-port",
	Usage: "Use a different port to connect to Tor",
	Value: 9150,
	},
	cli.BoolFlag{
	Name: "code",
	Usage: "Specifies this post is code",
	},
	cli.StringFlag{
	Name: "font",
	Usage: "Sets post font to given value",
	Value: defaultFont,
	},
	}

	func main() {
	initialize()

	// Run the app
	app := cli.NewApp()
	app.Name = "writeas"
	app.Version = version
	app.Usage = "Simple text pasting and publishing"
	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 EDITOR environment variable, or vim, or finally nano.

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

	If posting fails for any reason, 'writeas' will show you the temporary file
	location and how to pipe it to 'writeas' to retry.`,
	Action: cmdNew,
	Flags: postFlags,
	},
	{
	Name: "delete",
	Usage: "Delete a post",
	Action: cmdDelete,
	Flags: []cli.Flag{
	cli.BoolFlag{
	Name: "tor, t",
	Usage: "Delete via Tor hidden service",
	},
	cli.IntFlag{
	Name: "tor-port",
	Usage: "Use a different port to connect to Tor",
	Value: 9150,
	},
	},
	},
	{
	Name: "update",
	Usage: "Update (overwrite) a post",
	Action: cmdUpdate,
	Flags: []cli.Flag{
	cli.BoolFlag{
	Name: "tor, t",
	Usage: "Update via Tor hidden service",
	},
	cli.IntFlag{
	Name: "tor-port",
	Usage: "Use a different port to connect to Tor",
	Value: 9150,
	},
	cli.BoolFlag{
	Name: "code",
	Usage: "Specifies this post is code",
	},
	cli.StringFlag{
	Name: "font",
	Usage: "Sets post font to given value",
	},
	},
	},
	{
	Name: "get",
	Usage: "Read a raw post",
	Action: cmdGet,
	Flags: []cli.Flag{
	cli.BoolFlag{
	Name: "tor, t",
	Usage: "Get from Tor hidden service",
	},
	cli.IntFlag{
	Name: "tor-port",
	Usage: "Use a different port to connect to Tor",
	Value: 9150,
	},
	},
	},
	{
	Name: "add",
	Usage: "Add an existing post locally",
	Description: `A way to add an existing post to your local store for easy editing later.

	This requires a post ID (from https://write.as/[ID]) and an Edit Token
	(exported from another Write.as client, such as the Android app).
	`,
	Action: cmdAdd,
	},
	{
	Name: "list",
	Usage: "List local posts",
	Action: cmdList,
	Flags: []cli.Flag{
	cli.BoolFlag{
	Name: "id",
	Usage: "Show list with post IDs (default)",
	},
	cli.BoolFlag{
	Name: "url",
	Usage: "Show list with URLs",
	},
	},
	},
	}

	cli.CommandHelpTemplate = `NAME:
	{{.Name}} - {{.Usage}}

	USAGE:
	writeas {{.Name}}{{if .Flags}} [command options]{{end}} [arguments...]{{if .Description}}

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

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

	app.Run(os.Args)
	}

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

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

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

	return fullPost
	}

	func check(err error) {
	if err != nil {
	fmt.Fprintf(os.Stderr, "writeas: %s\n", err)
	os.Exit(1)
	}
	}

	func handlePost(fullPost []byte, c *cli.Context) error {
	tor := c.Bool("tor") \|\| c.Bool("t")
	if c.Int("tor-port") != 0 {
	torPort = c.Int("tor-port")
	}
	if tor {
	fmt.Println("Posting to hidden service...")
	} else {
	fmt.Println("Posting...")
	}

	return DoPost(fullPost, c.String("font"), false, tor, c.Bool("code"))
	}

	func client(read, tor bool, path, query string) (string, *http.Client) {
	var u *url.URL
	var client *http.Client
	if tor {
	- u, _ = url.ParseRequestURI(hiddenApiUrl)
	+ u, _ = url.ParseRequestURI(hiddenAPIURL)
	u.Path = "/api/" + path
	client = torClient()
	} else {
	- u, _ = url.ParseRequestURI(apiUrl)
	+ u, _ = url.ParseRequestURI(apiURL)
	u.Path = "/api/" + path
	client = &http.Client{}
	}
	if query != "" {
	u.RawQuery = query
	}
	urlStr := fmt.Sprintf("%v", u)

	return urlStr, client
	}

	-func DoFetch(friendlyId string, tor bool) {
	- path := friendlyId
	+// DoFetch retrieves the Write.as post with the given friendlyID,
	+// optionally via the Tor hidden service.
	+func DoFetch(friendlyID string, tor bool) {
	+ path := friendlyID

	urlStr, client := client(true, tor, path, "")

	r, _ := http.NewRequest("GET", urlStr, nil)
	r.Header.Add("User-Agent", "writeas-cli v"+version)

	resp, err := client.Do(r)
	check(err)
	defer resp.Body.Close()

	if resp.StatusCode == http.StatusOK {
	content, err := ioutil.ReadAll(resp.Body)
	check(err)
	fmt.Printf("%s\n", string(content))
	} else if resp.StatusCode == http.StatusNotFound {
	fmt.Printf("Post not found.\n")
	} else {
	fmt.Printf("Problem getting post: %s\n", resp.Status)
	}
	}

	+// DoPost creates a Write.as post, returning an error if it was
	+// unsuccessful.
	func DoPost(post []byte, font string, encrypt, tor, code bool) error {
	data := url.Values{}
	data.Set("w", string(post))
	if encrypt {
	data.Add("e", "")
	}
	data.Add("font", getFont(code, font))

	urlStr, client := client(false, tor, "", "")

	r, _ := http.NewRequest("POST", urlStr, bytes.NewBufferString(data.Encode()))
	r.Header.Add("User-Agent", "writeas-cli v"+version)
	r.Header.Add("Content-Type", "application/x-www-form-urlencoded")
	r.Header.Add("Content-Length", strconv.Itoa(len(data.Encode())))

	resp, err := client.Do(r)
	if err != nil {
	return err
	}
	defer resp.Body.Close()

	if resp.StatusCode == http.StatusOK {
	content, err := ioutil.ReadAll(resp.Body)
	if err != nil {
	return err
	}

	nlPos := strings.Index(string(content), "\n")
	url := content[:nlPos]
	idPos := strings.LastIndex(string(url), "/") + 1
	id := string(url[idPos:])
	token := string(content[nlPos+1 : len(content)-1])

	addPost(id, token)

	// Copy URL to clipboard
	err = clipboard.WriteAll(string(url))
	if err != nil {
	fmt.Fprintf(os.Stderr, "writeas: Didn't copy to clipboard: %s\n", err)
	} else {
	fmt.Println("Copied to clipboard.")
	}

	// Output URL
	fmt.Printf("%s\n", url)
	} else {
	- return errors.New(fmt.Sprintf("Unable to post: %s", resp.Status))
	+ return fmt.Errorf("Unable to post: %s", resp.Status)
	}

	return nil
	}

	-func DoUpdate(post []byte, friendlyId, token, font string, tor, code bool) {
	- urlStr, client := client(false, tor, friendlyId, fmt.Sprintf("t=%s", token))
	+// DoUpdate updates the given post on Write.as.
	+func DoUpdate(post []byte, friendlyID, token, font string, tor, code bool) {
	+ urlStr, client := client(false, tor, friendlyID, fmt.Sprintf("t=%s", token))

	data := url.Values{}
	data.Set("w", string(post))

	if code \|\| font != "" {
	// Only update font if explicitly changed
	data.Add("font", getFont(code, font))
	}

	r, _ := http.NewRequest("POST", urlStr, bytes.NewBufferString(data.Encode()))
	r.Header.Add("User-Agent", "writeas-cli v"+version)
	r.Header.Add("Content-Type", "application/x-www-form-urlencoded")
	r.Header.Add("Content-Length", strconv.Itoa(len(data.Encode())))

	resp, err := client.Do(r)
	check(err)
	defer resp.Body.Close()

	if resp.StatusCode == http.StatusOK {
	if tor {
	fmt.Println("Post updated via hidden service.")
	} else {
	fmt.Println("Post updated.")
	}
	} else {
	if debug {
	fmt.Printf("Problem updating: %s\n", resp.Status)
	} else {
	fmt.Printf("Post doesn't exist, or bad edit token given.\n")
	}
	}
	}

	-func DoDelete(friendlyId, token string, tor bool) {
	- urlStr, client := client(false, tor, friendlyId, fmt.Sprintf("t=%s", token))
	+// DoDelete deletes the given post on Write.as.
	+func DoDelete(friendlyID, token string, tor bool) {
	+ urlStr, client := client(false, tor, friendlyID, fmt.Sprintf("t=%s", token))

	r, _ := http.NewRequest("DELETE", urlStr, nil)
	r.Header.Add("User-Agent", "writeas-cli v"+version)
	r.Header.Add("Content-Type", "application/x-www-form-urlencoded")

	resp, err := client.Do(r)
	check(err)
	defer resp.Body.Close()

	if resp.StatusCode == http.StatusOK {
	if tor {
	fmt.Println("Post deleted from hidden service.")
	} else {
	fmt.Println("Post deleted.")
	}
	- removePost(friendlyId)
	+ removePost(friendlyID)
	} else {
	if debug {
	fmt.Printf("Problem deleting: %s\n", resp.Status)
	} else {
	fmt.Printf("Post doesn't exist, or bad edit token given.\n")
	}
	}
	}
	diff --git a/writeas/fonts.go b/writeas/fonts.go
	index fec686c..28684e9 100644
	--- a/writeas/fonts.go
	+++ b/writeas/fonts.go
	@@ -1,46 +1,46 @@
	package main

	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 {
	if code {
	if font != "" && font != defaultFont {
	fmt.Printf("A non-default font '%s' and --code flag given. 'code' type takes precedence.\n", font)
	}
	return "code"
	- } else {
	- // Validate font value
	- if f, ok := postFontMap[font]; ok {
	- return string(f)
	- } else {
	- fmt.Printf("Font '%s' invalid. Using default '%s'\n", font, defaultFont)
	- return string(defaultFont)
	- }
	}
	+
	+ // 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)
	}
	diff --git a/writeas/posts.go b/writeas/posts.go
	index 8f65639..2124cff 100644
	--- a/writeas/posts.go
	+++ b/writeas/posts.go
	@@ -1,155 +1,156 @@
	package main

	import (
	"fmt"
	"github.com/writeas/writeas-cli/utils"
	"io/ioutil"
	"os"
	"path/filepath"
	"strings"
	)

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

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

	func userDataDir() string {
	return filepath.Join(parentDataDir(), dataDirName)
	}

	func dataDirExists() bool {
	return fileutils.Exists(userDataDir())
	}

	func createDataDir() {
	err := os.Mkdir(userDataDir(), 0700)
	if err != nil {
	if debug {
	panic(err)
	} else {
	fmt.Printf("Error creating data directory: %s\n", err)
	return
	}
	}
	}

	func addPost(id, token string) {
	f, err := os.OpenFile(filepath.Join(userDataDir(), postsFile), os.O_WRONLY\|os.O_APPEND\|os.O_CREATE, 0600)
	if err != nil {
	if debug {
	panic(err)
	} else {
	fmt.Printf("Error creating local posts list: %s\n", err)
	return
	}
	}
	defer f.Close()

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

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

	func tokenFromID(id string) string {
	post := fileutils.FindLine(filepath.Join(userDataDir(), postsFile), id)
	if post == "" {
	return ""
	}

	parts := strings.Split(post, separator)
	if len(parts) < 2 {
	return ""
	}

	return parts[1]
	}

	func removePost(id string) {
	fileutils.RemoveLine(filepath.Join(userDataDir(), postsFile), id)
	}

	func getPosts() *[]Post {
	lines := fileutils.ReadData(filepath.Join(userDataDir(), postsFile))

	posts := []Post{}

	if lines != nil && len(*lines) > 0 {
	parts := make([]string, 2)
	for _, l := range *lines {
	parts = strings.Split(l, separator)
	if len(parts) < 2 {
	continue
	}
	posts = append(posts, Post{ID: parts[0], EditToken: parts[1]})
	}
	}

	return &posts
	}

	func composeNewPost() (string, *[]byte) {
	f, err := fileutils.TempFile(os.TempDir(), "WApost", "txt")
	if err != nil {
	if debug {
	panic(err)
	} else {
	fmt.Printf("Error creating temp file: %s\n", err)
	return "", nil
	}
	}
	f.Close()

	cmd := editPostCmd(f.Name())
	if cmd == nil {
	os.Remove(f.Name())

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

	if debug {
	panic(err)
	} else {
	fmt.Printf("Error starting editor: %s\n", err)
	return "", nil
	}
	}

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

	post, err := ioutil.ReadFile(f.Name())
	if err != nil {
	if debug {
	panic(err)
	} else {
	fmt.Printf("Error reading post: %s\n", err)
	return "", nil
	}
	}
	return f.Name(), &post
	}

File Metadata

Mime Type: text/x-diff
Expires: Mon, Jan 20, 1:45 AM (1 d, 6 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 3137471

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions