diff --git a/GUIDE.md b/GUIDE.md
index 864ae45..87a2948 100644
--- a/GUIDE.md
+++ b/GUIDE.md
@@ -1,143 +1,110 @@
# Write.as CLI User Guide
The Write.as Command-Line Interface (CLI) is a cross-platform tool for publishing text to [Write.as](https://write.as) and its other sites, like [Paste.as](https://paste.as). It is designed to be simple, scriptable, do one job (publishing) well, and work as you'd expect with other command-line tools.
Write.as is a text-publishing service that protects your privacy. There's no sign up required to publish, but if you do sign up, you can access posts across devices and compile collections of them in what most people would call a "blog".
+**Note** accounts are not supported in CLI v1.0. They'll be available in [v2.0](https://github.com/writeas/writeas-cli/milestone/4).
+
## Uses
These are a few common uses for `writeas`. If you get stuck or want to know more, run `writeas [command] --help`. If you still have questions, [ask us](https://write.as/contact).
### Overview
```
- writeas [global options] command [command options] [arguments...]
+writeas [global options] command [command options] [arguments...]
COMMANDS:
- post Alias for default action: create post from stdin
- new Compose a new post from the command-line and publish
- publish Publish a file to Write.as
- delete Delete a post
- update Update (overwrite) a post
- get Read a raw post
- add Add an existing post locally
- posts List all of your posts
- claim Claim local unsynced posts
- blogs List blogs
- auth Authenticate with Write.as
- logout Log out of Write.as
- help, h Shows a list of commands or help for one command
+ post Alias for default action: create post from stdin
+ new Compose a new post from the command-line and publish
+ publish Publish a file to Write.as
+ delete Delete a post
+ update Update (overwrite) a post
+ get Read a raw post
+ add Add an existing post locally
+ list List local posts
+ auth Authenticate with Write.as
+ help, h Shows a list of commands or help for one command
GLOBAL OPTIONS:
- -c value, -b value Optional blog to post to
--tor, -t Perform action on Tor hidden service
--tor-port value Use a different port to connect to Tor (default: 9150)
--code Specifies this post is code
- --md Returns post URL with Markdown enabled
--verbose, -v Make the operation more talkative
--font value Sets post font to given value (default: "mono")
- --lang value Sets post language to given ISO 639-1 language code
--user-agent value Sets the User-Agent for API requests
--help, -h show help
--version, -V print the version
```
#### Share something
By default, `writeas` creates a post with a `monospace` typeface that doesn't word wrap (scrolls horizontally). It will return a single line with a URL, and automatically copy that URL to the clipboard:
```bash
$ echo "Hello world!" | writeas
-https://write.as/aaaazzzzzzzza
+https://write.as/aaaaaaaaaaaa
```
This is generally more useful for posting terminal output or code, like so (the `--code` flag turns on syntax highlighting):
macOS / Linux: `cat writeas/cli.go | writeas --code`
Windows: `type writeas/cli.go | writeas.exe --code`
#### Output a post
This outputs any Write.as post with the given ID.
```bash
-$ writeas get aaaazzzzzzzza
+$ writeas get aaaaaaaaaaaa
Hello world!
```
-#### Authenticate
-
-This will authenticate with write.as and store the user access token locally, until you explicitly logout.
-```bash
-$ writeas auth username
-Password: ************
-```
-
-#### List all blogs
-
-This will output a list of the authenticated user's blogs.
-```bash
-$ writeas blogs
-Alias Title
-user An Example Blog
-dev My Dev Log
-```
-
#### List all published posts
-This lists all posts you've published from your device, as well as any published by the authenticated user.
+This lists all posts you've published from your device.
Pass the `--url` flag to show the list with full post URLs, and the `--md` flag to return URLs with Markdown enabled.
```bash
-$ writeas posts
-Local ID Token
-unsynced aaaazzzzzzzza dhuieoj23894jhf984hdfs9834hdf84j
-
-Account ID Title
-synced mmmmmmmm33333333 This is a post
+$ writeas list
+aaaaaaaaaaaa
```
#### Delete a post
This permanently deletes a post you own.
```bash
-$ writeas delete aaaazzzzzzzza
+$ writeas delete aaaaaaaaaaaa
```
#### Update a post
This completely overwrites an existing post you own.
```bash
-$ echo "See you later!" | writeas update aaaazzzzzzzza
-```
-
-#### Claim a post
-
-This moves an unsynced local post to a draft on your account. You will need to authenticate first.
-```bash
-$ writeas claim aaaazzzzzzzza
+$ echo "See you later!" | writeas update aaaaaaaaaaaa
```
### Composing posts
If you simply have a penchant for never leaving your keyboard, `writeas` is great for composing new posts from the command-line. Just use the `new` subcommand.
`writeas new` will open your favorite command-line editor, as specified by your `WRITEAS_EDITOR` or `EDITOR` environment variables (in that order), falling back to `vim` on OS X / *nix.
Customize your post's appearance with the `--font` flag:
| Argument | Appearance (Typeface) | Word Wrap? |
| -------- | --------------------- | ---------- |
| `sans` | Sans-serif (Open Sans) | Yes |
| `serif` | Serif (Lora) | Yes |
| `wrap` | Monospace | Yes |
| `mono` | Monospace | No |
| `code` | Syntax-highlighted monospace | No |
Put it all together, e.g. publish with a sans-serif font: `writeas new --font sans`
If you're publishing Markdown, supply the `--md` flag to get a URL back that will render Markdown, e.g.: `writeas new --font sans --md`
diff --git a/README.md b/README.md
index 65841f4..ef43b03 100644
--- a/README.md
+++ b/README.md
@@ -1,109 +1,93 @@
writeas-cli
===========
- [](https://goreportcard.com/report/github.com/writeas/writeas-cli) [](http://webchat.freenode.net/?channels=writeas) [](https://discuss.write.as/c/development)
+ [](https://goreportcard.com/report/github.com/writeas/writeas-cli) [](http://webchat.freenode.net/?channels=writeas) [](http://slack.write.as/)
Command line interface for [Write.as](https://write.as). Works on Windows, macOS, and Linux.
-**NOTE: the `master` branch is currently unstable while we prepare the v2.0 release! You should install via official release channel, or build from the `v1.2` tag.**
-
## Features
* Publish anonymously to Write.as
-* Authenticate with a Write.as account
-* A stable, easy back-end for your [GUI app](https://write.as/apps/desktop) or desktop-based workflow
+* A stable, easy back-end for your GUI app or desktop-based workflow
* Compatible with our [Tor hidden service](http://writeas7pm7rcdqg.onion/)
* Locally keeps track of any posts you make
-* Update and delete posts, anonymous and authenticated
+* Update and delete anonymous posts
* Fetch any post by ID
* Add anonymous post credentials (like for one published with the [Android app](https://play.google.com/store/apps/details?id=com.abunchtell.writeas)) for editing
## Installing
The easiest way to get the CLI is to download a pre-built executable for your OS.
### Download
[](https://github.com/writeas/writeas-cli/releases/latest) 
Get the latest version for your operating system as a standalone executable.
**Windows**
-Download the [64-bit](https://github.com/writeas/writeas-cli/releases/download/v1.2/writeas_1.2_windows_amd64.zip) or [32-bit](https://github.com/writeas/writeas-cli/releases/download/v1.2/writeas_1.2_windows_386.zip) executable and put it somewhere in your `%PATH%`.
+Download the [64-bit](https://github.com/writeas/writeas-cli/releases/download/v1.1/writeas_1.1_windows_amd64.zip) or [32-bit](https://github.com/writeas/writeas-cli/releases/download/v1.1/writeas_1.1_windows_386.zip) executable and put it somewhere in your `%PATH%`.
**macOS**
-Download the [64-bit](https://github.com/writeas/writeas-cli/releases/download/v1.2/writeas_1.2_darwin_amd64.tar.gz) executable and put it somewhere in your `$PATH`, like `/usr/local/bin`.
-
-**Debian-based Linux**
-```bash
-sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys DBE07445
-sudo add-apt-repository "deb http://updates.writeas.org xenial main"
-sudo apt-get update && sudo apt-get install writeas-cli
-```
+Download the [64-bit](https://github.com/writeas/writeas-cli/releases/download/v1.1/writeas_1.1_darwin_amd64.tar.gz) executable and put it somewhere in your `$PATH`, like `/usr/local/bin`.
-**Linux (other)**
-Download the [64-bit](https://github.com/writeas/writeas-cli/releases/download/v1.2/writeas_1.2_linux_amd64.tar.gz) or [32-bit](https://github.com/writeas/writeas-cli/releases/download/v1.2/writeas_1.2_linux_386.tar.gz) executable and put it somewhere in your `$PATH`, like `/usr/local/bin`.
+**Linux**
+Download the [64-bit](https://github.com/writeas/writeas-cli/releases/download/v1.1/writeas_1.1_linux_amd64.tar.gz) or [32-bit](https://github.com/writeas/writeas-cli/releases/download/v1.1/writeas_1.1_linux_386.tar.gz) executable and put it somewhere in your `$PATH`, like `/usr/local/bin`.
### Go get it
```bash
go get github.com/writeas/writeas-cli/cmd/writeas
```
Once this finishes, you'll see `writeas` or `writeas.exe` inside `$GOPATH/bin/`.
## Upgrading
To upgrade the CLI, download and replace the executable you downloaded before.
If you previously installed with `go get`, run it again with the `-u` option.
```bash
go get -u github.com/writeas/writeas-cli/cmd/writeas
```
## Usage
See full usage documentation on our [User Guide](GUIDE.md).
```
- writeas [global options] command [command options] [arguments...]
+writeas [global options] command [command options] [arguments...]
COMMANDS:
- post Alias for default action: create post from stdin
- new Compose a new post from the command-line and publish
- publish Publish a file to Write.as
- delete Delete a post
- update Update (overwrite) a post
- get Read a raw post
- add Add an existing post locally
- posts List all of your posts
- blogs List blogs
- claim Claim local unsynced posts
- auth Authenticate with Write.as
- logout Log out of Write.as
- help, h Shows a list of commands or help for one command
+ post Alias for default action: create post from stdin
+ new Compose a new post from the command-line and publish
+ publish Publish a file to Write.as
+ delete Delete a post
+ update Update (overwrite) a post
+ get Read a raw post
+ add Add an existing post locally
+ list List local posts
+ auth Authenticate with Write.as
+ help, h Shows a list of commands or help for one command
GLOBAL OPTIONS:
- -c value, -b value Optional blog to post to
--tor, -t Perform action on Tor hidden service
--tor-port value Use a different port to connect to Tor (default: 9150)
--code Specifies this post is code
- --md Returns post URL with Markdown enabled
--verbose, -v Make the operation more talkative
--font value Sets post font to given value (default: "mono")
- --lang value Sets post language to given ISO 639-1 language code
--user-agent value Sets the User-Agent for API requests
--help, -h show help
--version, -V print the version
```
## Contributing to the CLI
For a complete guide to contributing, see the [Contribution Guide](.github/CONTRIBUTING.md).
We welcome any kind of contributions including documentation, organizational improvements, tutorials, bug reports, feature requests, new features, answering questions, etc.
### Getting Support
-We're available on [several channels](https://write.as/contact), and prefer our [forum](https://discuss.write.as) for project discussion. Please don't use the GitHub issue tracker to ask questions.
+We're available on [several channels](https://write.as/contact), and prefer the #development channel [in Slack](http://slack.write.as) for project discussion. Please don't use the GitHub issue tracker to ask questions.
### Reporting Issues
If you believe you have found a bug in the CLI or its documentation, file an issue on this repo. If you're not sure if it's a bug or not, [reach out to us](https://write.as/contact) in one way or another. Be sure to provide the version of the CLI (with `writeas --version`) in your report.
diff --git a/api/api.go b/api/api.go
index d3fa3fc..c6c9fee 100644
--- a/api/api.go
+++ b/api/api.go
@@ -1,267 +1,218 @@
package api
import (
"fmt"
"path/filepath"
"github.com/atotto/clipboard"
- writeas "github.com/writeas/go-writeas/v2"
"github.com/writeas/web-core/posts"
"github.com/writeas/writeas-cli/config"
"github.com/writeas/writeas-cli/fileutils"
"github.com/writeas/writeas-cli/log"
+ writeas "go.code.as/writeas.v2"
cli "gopkg.in/urfave/cli.v1"
)
func client(userAgent string, tor bool) *writeas.Client {
var client *writeas.Client
if tor {
client = writeas.NewTorClient(TorPort)
} else {
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) {
var client *writeas.Client
if config.IsTor(c) {
client = writeas.NewTorClient(TorPort)
} else {
if config.IsDev() {
client = writeas.NewDevClient()
} else {
client = writeas.NewClient()
}
}
client.UserAgent = config.UserAgent(c)
// TODO: load user into var shared across the app
u, _ := config.LoadUser(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
if u != nil {
client.SetToken(u.AccessToken)
} else if authRequired {
return nil, fmt.Errorf("Not currently logged in. Authenticate with: writeas auth ")
}
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
}
-// DoFetchPosts retrieves all remote posts for the
-// authenticated user
-func DoFetchPosts(c *cli.Context) ([]writeas.Post, error) {
- cl, err := NewClient(c, true)
- if err != nil {
- return nil, err
- }
-
- posts, err := cl.GetUserPosts()
- if err != nil {
- return nil, err
- }
-
- return *posts, nil
-}
-
// DoPost creates a Write.as post, returning an error if it was
// unsuccessful.
func DoPost(c *cli.Context, post []byte, font string, encrypt, tor, code bool) (*writeas.Post, error) {
cl, _ := NewClient(c, false)
pp := &writeas.PostParams{
Font: config.GetFont(code, font),
Collection: config.Collection(c),
}
pp.Title, pp.Content = posts.ExtractTitle(string(post))
if lang := config.Language(c, true); lang != "" {
pp.Language = &lang
}
p, err := cl.CreatePost(pp)
if err != nil {
return nil, fmt.Errorf("Unable to post: %v", err)
}
var url string
if p.Collection != nil {
url = p.Collection.URL + p.Slug
} else {
if tor {
url = config.TorBaseURL
} else if config.IsDev() {
url = config.DevBaseURL
} else {
url = config.WriteasBaseURL
}
url += "/" + p.ID
// Output URL in requested format
if c.Bool("md") {
url += ".md"
}
}
if cl.Token() == "" {
// Store post locally, since we're not authenticated
AddPost(c, p.ID, p.Token)
}
// Copy URL to clipboard
err = clipboard.WriteAll(string(url))
if err != nil {
log.Errorln("writeas: Didn't copy to clipboard: %s", err)
} else {
log.Info(c, "Copied to clipboard.")
}
// Output URL
fmt.Printf("%s\n", url)
return p, nil
}
-// DoFetchCollections retrieves a list of the currently logged in users
-// collections.
-func DoFetchCollections(c *cli.Context) ([]RemoteColl, error) {
- cl, err := NewClient(c, true)
- if err != nil {
- if config.Debug() {
- log.ErrorlnQuit("could not create new client: %v", err)
- }
- return nil, fmt.Errorf("Couldn't create new client")
- }
-
- colls, err := cl.GetUserCollections()
- if err != nil {
- if config.Debug() {
- log.ErrorlnQuit("failed fetching user collections: %v", err)
- }
- return nil, fmt.Errorf("Couldn't get user collections")
- }
-
- out := make([]RemoteColl, len(*colls))
-
- for i, c := range *colls {
- coll := RemoteColl{
- Alias: c.Alias,
- Title: c.Title,
- URL: c.URL,
- }
- out[i] = coll
- }
-
- return out, nil
-}
-
// DoUpdate updates the given post on Write.as.
func DoUpdate(c *cli.Context, post []byte, friendlyID, token, font string, tor, code bool) error {
cl, _ := NewClient(c, false)
params := writeas.PostParams{}
params.Title, params.Content = posts.ExtractTitle(string(post))
if lang := config.Language(c, false); lang != "" {
params.Language = &lang
}
if code || font != "" {
params.Font = config.GetFont(code, font)
}
_, err := cl.UpdatePost(friendlyID, token, ¶ms)
if err != nil {
if config.Debug() {
log.ErrorlnQuit("Problem updating: %v", err)
}
return fmt.Errorf("Post doesn't exist, or bad edit token given.")
}
if tor {
log.Info(c, "Post updated via hidden service.")
} else {
log.Info(c, "Post updated.")
}
return nil
}
-// DoDelete deletes the given post on Write.as, and removes any local references
+// DoDelete deletes the given post on Write.as.
func DoDelete(c *cli.Context, friendlyID, token string, tor bool) error {
cl, _ := NewClient(c, false)
err := cl.DeletePost(friendlyID, token)
if err != nil {
if config.Debug() {
log.ErrorlnQuit("Problem deleting: %v", err)
}
return fmt.Errorf("Post doesn't exist, or bad edit token given.")
}
if tor {
log.Info(c, "Post deleted from hidden service.")
} else {
log.Info(c, "Post deleted.")
}
- RemovePost(c.App.ExtraInfo()["configDir"], friendlyID)
+ removePost(c.App.ExtraInfo()["configDir"], friendlyID)
return nil
}
func DoLogIn(c *cli.Context, username, password string) error {
cl := client(config.UserAgent(c), config.IsTor(c))
u, err := cl.LogIn(username, password)
if err != nil {
if config.Debug() {
log.ErrorlnQuit("Problem logging in: %v", err)
}
return err
}
err = config.SaveUser(config.UserDataDir(c.App.ExtraInfo()["configDir"]), u)
if err != nil {
return err
}
log.Info(c, "Logged in as %s.\n", u.User.Username)
return nil
}
func DoLogOut(c *cli.Context) error {
cl, err := NewClient(c, true)
if err != nil {
return err
}
err = cl.LogOut()
if err != nil {
if config.Debug() {
log.ErrorlnQuit("Problem logging out: %v", err)
}
return err
}
// Delete local user data
err = fileutils.DeleteFile(filepath.Join(config.UserDataDir(c.App.ExtraInfo()["configDir"]), config.UserFile))
if err != nil {
return err
}
return nil
}
diff --git a/api/collections.go b/api/collections.go
deleted file mode 100644
index a7483b1..0000000
--- a/api/collections.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package api
-
-// RemoteColl represents a collection of posts
-// It is a reduced set of data from a go-writeas Collection
-type RemoteColl struct {
- Alias string
- Title string
- URL string
-}
diff --git a/api/posts.go b/api/posts.go
index 379a2c6..68d0ba1 100644
--- a/api/posts.go
+++ b/api/posts.go
@@ -1,304 +1,194 @@
package api
import (
"bufio"
"fmt"
"io"
"io/ioutil"
"os"
"path/filepath"
"strings"
- "time"
- writeas "github.com/writeas/go-writeas/v2"
"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
}
-// RemotePost holds addition information about published
-// posts
-type RemotePost struct {
- Post
- Title,
- Excerpt,
- Slug,
- Collection,
- EditToken string
- Synced bool
- Updated time.Time
-}
-
func AddPost(c *cli.Context, id, token string) error {
f, err := os.OpenFile(filepath.Join(config.UserDataDir(c.App.ExtraInfo()["configDir"]), 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
}
-// ClaimPost adds a local post to the authenticated user's account and deletes
-// the local reference
-func ClaimPosts(c *cli.Context, localPosts *[]Post) (*[]writeas.ClaimPostResult, error) {
- cl, err := NewClient(c, true)
- if err != nil {
- return nil, err
- }
- postsToClaim := make([]writeas.OwnedPostParams, len(*localPosts))
- for i, post := range *localPosts {
- postsToClaim[i] = writeas.OwnedPostParams{
- ID: post.ID,
- Token: post.EditToken,
- }
- }
-
- return cl.ClaimPosts(&postsToClaim)
-}
-
func TokenFromID(c *cli.Context, id string) string {
post := fileutils.FindLine(filepath.Join(config.UserDataDir(c.App.ExtraInfo()["configDir"]), postsFile), id)
if post == "" {
return ""
}
parts := strings.Split(post, separator)
if len(parts) < 2 {
return ""
}
return parts[1]
}
-func RemovePost(path, id string) {
+func removePost(path, id string) {
fileutils.RemoveLine(filepath.Join(config.UserDataDir(path), postsFile), id)
}
func GetPosts(c *cli.Context) *[]Post {
lines := fileutils.ReadData(filepath.Join(config.UserDataDir(c.App.ExtraInfo()["configDir"]), 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 GetUserPosts(c *cli.Context) ([]RemotePost, error) {
- waposts, err := DoFetchPosts(c)
- if err != nil {
- return nil, err
- }
-
- if len(waposts) == 0 {
- return nil, nil
- }
-
- posts := []RemotePost{}
- for _, p := range waposts {
- post := RemotePost{
- Post: Post{
- ID: p.ID,
- EditToken: p.Token,
- },
- Title: p.Title,
- Excerpt: getExcerpt(p.Content),
- Slug: p.Slug,
- Synced: p.Slug != "",
- Updated: p.Updated,
- }
- if p.Collection != nil {
- post.Collection = p.Collection.Alias
- }
- posts = append(posts, post)
- }
-
- return posts, nil
-}
-
-// getExcerpt takes in a content string and returns
-// a concatenated version. limited to no more than
-// two lines of 80 chars each. delimited by '...'
-func getExcerpt(input string) string {
- length := len(input)
-
- if length <= 80 {
- return input
- } else if length < 160 {
- ln1, idx := trimToLength(input, 80)
- if idx == -1 {
- idx = 80
- }
- ln2, _ := trimToLength(input[idx:], 80)
- return ln1 + "\n" + ln2
- } else {
- excerpt := input[:158]
- ln1, idx := trimToLength(excerpt, 80)
- if idx == -1 {
- idx = 80
- }
- ln2, _ := trimToLength(excerpt[idx:], 80)
- return ln1 + "\n" + ln2 + "..."
- }
-}
-
-func trimToLength(in string, l int) (string, int) {
- c := []rune(in)
- spaceIdx := -1
- length := len(c)
- if length <= l {
- return in, spaceIdx
- }
-
- for i := l; i > 0; i-- {
- if c[i] == ' ' {
- spaceIdx = i
- break
- }
- }
- if spaceIdx > -1 {
- c = c[:spaceIdx]
- }
- return string(c), spaceIdx
-}
-
func ComposeNewPost() (string, *[]byte) {
f, err := fileutils.TempFile(os.TempDir(), "WApost", "txt")
if err != nil {
if config.Debug() {
panic(err)
} else {
log.Errorln("Error creating temp file: %s", err)
return "", nil
}
}
f.Close()
cmd := config.EditPostCmd(f.Name())
if cmd == nil {
os.Remove(f.Name())
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 config.Debug() {
panic(err)
} else {
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 config.Debug() {
panic(err)
} else {
log.Errorln("Editor finished with error: %s", err)
return "", nil
}
}
post, err := ioutil.ReadFile(f.Name())
if err != nil {
if config.Debug() {
panic(err)
} else {
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
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/api/posts_test.go b/api/posts_test.go
deleted file mode 100644
index 8630efe..0000000
--- a/api/posts_test.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package api
-
-import "testing"
-
-func TestTrimToLength(t *testing.T) {
- tt := []struct {
- Name string
- Data string
- Length int
- ResultData string
- ResultIDX int
- }{
- {
- "English, longer than trim length",
- "This is a string, let's truncate it.",
- 12,
- "This is a",
- 9,
- }, {
- "English, equal to length",
- "Some other string.",
- 18,
- "Some other string.",
- -1,
- }, {
- "English, shorter than trim length",
- "I'm short!",
- 20,
- "I'm short!",
- -1,
- }, {
- "Multi-byte, longer than trim length",
- "這是一個較長的廣東話。 有許多特性可以確保足夠長的輸出。",
- 14,
- "這是一個較長的廣東話。",
- 11,
- }, {
- "Multi-byte, equal to length",
- "這是一個簡短的廣東話。",
- 11,
- "這是一個簡短的廣東話。",
- -1,
- }, {
- "Multi-byte, shorter than trim length",
- "我也很矮！ 有空間。",
- 20,
- "我也很矮！ 有空間。",
- -1,
- },
- }
-
- for _, tc := range tt {
- t.Run(tc.Name, func(t *testing.T) {
- out, idx := trimToLength(tc.Data, tc.Length)
- if out != tc.ResultData {
- t.Errorf("Incorrect output, expecting \"%s\" but got \"%s\"", tc.ResultData, out)
- }
-
- if idx != tc.ResultIDX {
- t.Errorf("Incorrect last index, expected \"%d\" but got \"%d\"", tc.ResultIDX, idx)
- }
- })
- }
-}
-
-func TestGetExcerpt(t *testing.T) {
- tt := []struct {
- Name string
- Data string
- Result string
- }{
- {
- "Shorter than one line",
- "This is much less than 80 chars",
- "This is much less than 80 chars",
- }, {
- "Exact length, one line",
- "This will be only 80 chars. Maybe all the way to column 88, that will do it. ---",
- "This will be only 80 chars. Maybe all the way to column 88, that will do it. ---",
- }, {
- "Shorter than two lines",
- "This will be more than one line but shorter than two. It should break at the 80th or less character. Let's check it out.",
- "This will be more than one line but shorter than two. It should break at the\n 80th or less character. Let's check it out.",
- }, {
- "Exact length, two lines",
- "This should be the exact length for two lines. There should ideally be no trailing periods to indicate further text. However trimToLength breaks on word bounds.",
- "This should be the exact length for two lines. There should ideally be no\n trailing periods to indicate further text. However trimToLength breaks on word...",
- }, {
- "Longer than two lines",
- "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque volutpat sagittis aliquet. Ut eu rutrum nisl. Proin molestie ante in dui vulputate dictum. Proin ac bibendum eros. Nulla porta congue tellus, sed vehicula sem bibendum eu. Donec vehicula erat viverra fermentum mattis. Integer volutpat.",
- "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque volutpat\n sagittis aliquet. Ut eu rutrum nisl. Proin molestie ante in dui vulputate...",
- },
- }
-
- for _, tc := range tt {
- t.Run(tc.Name, func(t *testing.T) {
- out := getExcerpt(tc.Data)
- if out != tc.Result {
- t.Errorf("Output does not match:\nexpected \"%s\"\nbut got \"%s\"", tc.Result, out)
- }
- })
- }
-}
diff --git a/cmd/writeas/main.go b/cmd/writeas/main.go
index c113d19..838e4de 100644
--- a/cmd/writeas/main.go
+++ b/cmd/writeas/main.go
@@ -1,265 +1,264 @@
package main
import (
"os"
+ "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"
)
func main() {
initialize(appInfo["configDir"])
cli.VersionFlag = cli.BoolFlag{
Name: "version, V",
Usage: "print the version",
}
// Run the app
app := cli.NewApp()
app.Name = "writeas"
app.Version = config.Version
app.Usage = "Publish text quickly"
app.Authors = []cli.Author{
{
Name: "Write.as",
Email: "hello@write.as",
},
}
app.ExtraInfo = func() map[string]string {
return appInfo
}
app.Action = commands.CmdPost
app.Flags = config.PostFlags
app.Commands = []cli.Command{
{
Name: "post",
Usage: "Alias for default action: create post from stdin",
Action: commands.CmdPost,
Flags: config.PostFlags,
Description: `Create a new post on Write.as from stdin.
Use the --code flag to indicate that the post should use syntax
highlighting. Or use the --font [value] argument to set the post's
appearance, where [value] is mono, monospace (default), wrap (monospace
font with word wrapping), serif, or sans.`,
},
{
Name: "new",
Usage: "Compose a new post from the command-line and publish",
Description: `An alternative to piping data to the program.
On Windows, this will use 'copy con' to start reading what you input from the
prompt. Press F6 or Ctrl-Z then Enter to end input.
On *nix, this will use the best available text editor, starting with the
value set to the WRITEAS_EDITOR or EDITOR environment variable, or vim, or
finally nano.
Use the --code flag to indicate that the post should use syntax
highlighting. Or use the --font [value] argument to set the post's
appearance, where [value] is mono, monospace (default), wrap (monospace
font with word wrapping), serif, or sans.
If posting fails for any reason, 'writeas' will show you the temporary file
location and how to pipe it to 'writeas' to retry.`,
Action: commands.CmdNew,
Flags: config.PostFlags,
},
{
Name: "publish",
Usage: "Publish a file to Write.as",
Action: commands.CmdPublish,
Flags: config.PostFlags,
},
{
Name: "delete",
Usage: "Delete a post",
Action: commands.CmdDelete,
Flags: []cli.Flag{
cli.BoolFlag{
Name: "tor, t",
Usage: "Delete via Tor hidden service",
},
cli.IntFlag{
Name: "tor-port",
Usage: "Use a different port to connect to Tor",
Value: 9150,
},
cli.BoolFlag{
Name: "verbose, v",
Usage: "Make the operation more talkative",
},
},
},
{
Name: "update",
Usage: "Update (overwrite) a post",
Action: commands.CmdUpdate,
Flags: []cli.Flag{
cli.BoolFlag{
Name: "tor, t",
Usage: "Update via Tor hidden service",
},
cli.IntFlag{
Name: "tor-port",
Usage: "Use a different port to connect to Tor",
Value: 9150,
},
cli.BoolFlag{
Name: "code",
Usage: "Specifies this post is code",
},
cli.StringFlag{
Name: "font",
Usage: "Sets post font to given value",
},
cli.BoolFlag{
Name: "verbose, v",
Usage: "Make the operation more talkative",
},
},
},
{
Name: "get",
Usage: "Read a raw post",
Action: commands.CmdGet,
Flags: []cli.Flag{
cli.BoolFlag{
Name: "tor, t",
Usage: "Get from Tor hidden service",
},
cli.IntFlag{
Name: "tor-port",
Usage: "Use a different port to connect to Tor",
Value: 9150,
},
cli.BoolFlag{
Name: "verbose, v",
Usage: "Make the operation more talkative",
},
},
},
{
Name: "add",
Usage: "Add an existing post locally",
Description: `A way to add an existing post to your local store for easy editing later.
This requires a post ID (from https://write.as/[ID]) and an Edit Token
(exported from another Write.as client, such as the Android app).
`,
Action: commands.CmdAdd,
},
{
- Name: "posts",
- Usage: "List all of your posts",
- Description: "This will list only local posts when not currently authenticated. To list remote posts as well, first run: writeas auth .",
- Action: commands.CmdListPosts,
+ Name: "list",
+ Usage: "List local posts",
+ 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: "blogs",
- Usage: "List blogs",
- Action: commands.CmdCollections,
+ },
+ {
+ Name: "fetch",
+ Usage: "Fetch authenticated user's Write.as posts",
+ Action: api.CmdPull,
Flags: []cli.Flag{
cli.BoolFlag{
- Name: "url",
- Usage: "Show list with URLs",
+ Name: "tor, t",
+ Usage: "Authenticate via Tor hidden service",
+ },
+ cli.IntFlag{
+ Name: "tor-port",
+ Usage: "Use a different port to connect to Tor",
+ Value: 9150,
},
- },
- }, {
- Name: "claim",
- Usage: "Claim local unsynced posts",
- Action: commands.CmdClaim,
- Description: "This will claim any unsynced posts local to this machine. To see which posts these are run: writeas posts.",
- Flags: []cli.Flag{
cli.BoolFlag{
Name: "verbose, v",
Usage: "Make the operation more talkative",
},
},
},
{
Name: "auth",
Usage: "Authenticate with Write.as",
Action: commands.CmdAuth,
Flags: []cli.Flag{
cli.BoolFlag{
Name: "tor, t",
Usage: "Authenticate via Tor hidden service",
},
cli.IntFlag{
Name: "tor-port",
Usage: "Use a different port to connect to Tor",
Value: 9150,
},
cli.BoolFlag{
Name: "verbose, v",
Usage: "Make the operation more talkative",
},
},
},
{
Name: "logout",
Usage: "Log out of Write.as",
Action: commands.CmdLogOut,
Flags: []cli.Flag{
cli.BoolFlag{
Name: "tor, t",
Usage: "Authenticate via Tor hidden service",
},
cli.IntFlag{
Name: "tor-port",
Usage: "Use a different port to connect to Tor",
Value: 9150,
},
cli.BoolFlag{
Name: "verbose, v",
Usage: "Make the operation more talkative",
},
},
},
}
cli.CommandHelpTemplate = `NAME:
{{.Name}} - {{.Usage}}
USAGE:
writeas {{.Name}}{{if .Flags}} [command options]{{end}} [arguments...]{{if .Description}}
DESCRIPTION:
{{.Description}}{{end}}{{if .Flags}}
OPTIONS:
{{range .Flags}}{{.}}
{{end}}{{ end }}
`
app.Run(os.Args)
}
func initialize(dataDirName string) {
// Ensure we have a data directory to use
if !config.DataDirExists(dataDirName) {
err := config.CreateDataDir(dataDirName)
if err != nil {
if config.Debug() {
panic(err)
} else {
log.Errorln("Error creating data directory: %s", err)
return
}
}
}
}
diff --git a/commands/commands.go b/commands/commands.go
index 0a4ba6a..dede994 100644
--- a/commands/commands.go
+++ b/commands/commands.go
@@ -1,339 +1,250 @@
package commands
import (
"fmt"
"io/ioutil"
"os"
- "text/tabwriter"
+ "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 := api.HandlePost(api.ReadStdIn(), c)
return err
}
func CmdNew(c *cli.Context) error {
fname, p := api.ComposeNewPost()
if p == nil {
// Assume composeNewPost already told us what the error was. Abort now.
os.Exit(1)
}
// Ensure we have something to post
if len(*p) == 0 {
// Clean up temporary post
if fname != "" {
os.Remove(fname)
}
log.InfolnQuit("Empty post. Bye!")
}
_, err := api.HandlePost(*p, c)
if err != nil {
log.Errorln("Error posting: %s\n%s", err, config.MessageRetryCompose(fname))
return cli.NewExitError("", 1)
}
// Clean up temporary post
if fname != "" {
os.Remove(fname)
}
return nil
}
func CmdPublish(c *cli.Context) error {
filename := c.Args().Get(0)
if filename == "" {
return cli.NewExitError("usage: writeas publish ", 1)
}
content, err := ioutil.ReadFile(filename)
if err != nil {
return err
}
- _, err = api.HandlePost(content, c)
+ p, err := api.HandlePost(content, c)
+ if err != nil {
+ return err
+ }
- // TODO: write local file if directory is set
- return err
+ // Save post to posts folder
+ cfg, err := config.LoadConfig(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
+ if cfg.Posts.Directory != "" {
+ err = api.WritePost(cfg.Posts.Directory, p)
+ if err != nil {
+ return err
+ }
+ }
+ return nil
}
func CmdDelete(c *cli.Context) error {
friendlyID := c.Args().Get(0)
token := c.Args().Get(1)
if friendlyID == "" {
return cli.NewExitError("usage: writeas delete []", 1)
}
u, _ := config.LoadUser(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
if token == "" {
// Search for the token locally
token = api.TokenFromID(c, friendlyID)
if token == "" && u == nil {
log.Errorln("Couldn't find an edit token locally. Did you create this post here?")
log.ErrorlnQuit("If you have an edit token, use: writeas delete %s ", friendlyID)
}
}
tor := config.IsTor(c)
if c.Int("tor-port") != 0 {
api.TorPort = c.Int("tor-port")
}
if tor {
log.Info(c, "Deleting via hidden service...")
} else {
log.Info(c, "Deleting...")
}
err := api.DoDelete(c, friendlyID, token, tor)
if err != nil {
- return cli.NewExitError(fmt.Sprintf("Couldn't delete remote copy: %v", err), 1)
+ return err
+ }
+
+ // Delete local file, if necessary
+ cfg, err := config.LoadConfig(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
+ if cfg.Posts.Directory != "" {
+ // TODO: handle deleting blog posts
+ err = fileutils.DeleteFile(filepath.Join(cfg.Posts.Directory, friendlyID+api.PostFileExt))
+ if err != nil {
+ return err
+ }
}
- // TODO: Delete local file, if necessary
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 []", 1)
}
u, _ := config.LoadUser(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
if token == "" {
// Search for the token locally
token = api.TokenFromID(c, friendlyID)
if token == "" && u == nil {
log.Errorln("Couldn't find an edit token locally. Did you create this post here?")
log.ErrorlnQuit("If you have an edit token, use: writeas update %s ", friendlyID)
}
}
// Read post body
fullPost := api.ReadStdIn()
tor := config.IsTor(c)
if c.Int("tor-port") != 0 {
api.TorPort = c.Int("tor-port")
}
if tor {
log.Info(c, "Updating via hidden service...")
} else {
log.Info(c, "Updating...")
}
return api.DoUpdate(c, fullPost, friendlyID, token, c.String("font"), tor, c.Bool("code"))
}
func CmdGet(c *cli.Context) error {
friendlyID := c.Args().Get(0)
if friendlyID == "" {
return cli.NewExitError("usage: writeas get ", 1)
}
tor := config.IsTor(c)
if c.Int("tor-port") != 0 {
api.TorPort = c.Int("tor-port")
}
if tor {
log.Info(c, "Getting via hidden service...")
} else {
log.Info(c, "Getting...")
}
return api.DoFetch(friendlyID, config.UserAgent(c), tor)
}
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 ", 1)
}
err := api.AddPost(c, friendlyID, token)
return err
}
-func CmdListPosts(c *cli.Context) error {
+func CmdList(c *cli.Context) error {
urls := c.Bool("url")
ids := c.Bool("id")
var p api.Post
posts := api.GetPosts(c)
- tw := tabwriter.NewWriter(os.Stdout, 10, 0, 2, ' ', tabwriter.TabIndent)
- numPosts := len(*posts)
- if ids || !urls && numPosts != 0 {
- fmt.Fprintf(tw, "Local\t%s\t%s\t\n", "ID", "Token")
- } else if numPosts != 0 {
- fmt.Fprintf(tw, "Local\t%s\t%s\t\n", "URL", "Token")
- } else {
- fmt.Fprintf(tw, "No local posts found\n")
- }
for i := range *posts {
- p = (*posts)[numPosts-1-i]
+ p = (*posts)[len(*posts)-1-i]
if ids || !urls {
- fmt.Fprintf(tw, "unsynced\t%s\t%s\t\n", p.ID, p.EditToken)
- } else {
- fmt.Fprintf(tw, "unsynced\t%s\t%s\t\n", getPostURL(c, p.ID), p.EditToken)
+ fmt.Printf("%s ", p.ID)
}
- }
- u, _ := config.LoadUser(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
- if u != nil {
- remotePosts, err := api.GetUserPosts(c)
- if err != nil {
- fmt.Println(err)
- }
-
- if len(remotePosts) > 0 {
- identifier := "URL"
- if ids || !urls {
- identifier = "ID"
- }
- fmt.Fprintf(tw, "\nAccount\t%s\t%s\t\n", identifier, "Title")
- }
- for _, p := range remotePosts {
- identifier := getPostURL(c, p.ID)
- if ids || !urls {
- identifier = p.ID
+ if urls {
+ base := config.WriteasBaseURL
+ if config.IsDev() {
+ base = config.DevBaseURL
}
- synced := "unsynced"
- if p.Synced {
- synced = "synced"
+ ext := ""
+ // Output URL in requested format
+ if c.Bool("md") {
+ ext = ".md"
}
- fmt.Fprintf(tw, "%s\t%s\t%s\t\n", synced, identifier, p.Title)
- }
- }
- return tw.Flush()
-}
-
-func getPostURL(c *cli.Context, slug string) string {
- base := config.WriteasBaseURL
- if config.IsDev() {
- base = config.DevBaseURL
- }
- ext := ""
- // Output URL in requested format
- if c.Bool("md") {
- ext = ".md"
- }
- return fmt.Sprintf("%s/%s%s", base, slug, ext)
-}
-
-func CmdCollections(c *cli.Context) error {
- u, err := config.LoadUser(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
- if err != nil {
- return cli.NewExitError(fmt.Sprintf("couldn't load config: %v", err), 1)
- }
- if u == nil {
- return cli.NewExitError("You must be authenticated to view collections.\nLog in first with: writeas auth ", 1)
- }
- colls, err := api.DoFetchCollections(c)
- if err != nil {
- return cli.NewExitError(fmt.Sprintf("Couldn't get collections for user %s: %v", u.User.Username, err), 1)
- }
- urls := c.Bool("url")
- tw := tabwriter.NewWriter(os.Stdout, 8, 0, 2, ' ', tabwriter.TabIndent)
- detail := "Title"
- if urls {
- detail = "URL"
- }
- fmt.Fprintf(tw, "%s\t%s\t\n", "Alias", detail)
- for _, c := range colls {
- dData := c.Title
- if urls {
- dData = c.URL
- }
- fmt.Fprintf(tw, "%s\t%s\t\n", c.Alias, dData)
- }
- tw.Flush()
- return nil
-}
-
-func CmdClaim(c *cli.Context) error {
- u, err := config.LoadUser(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
- if err != nil {
- return cli.NewExitError(fmt.Sprintf("couldn't load config: %v", err), 1)
- }
- if u == nil {
- return cli.NewExitError("You must be authenticated to claim local posts.\nLog in first with: writeas auth ", 1)
- }
-
- localPosts := api.GetPosts(c)
- if len(*localPosts) == 0 {
- return nil
- }
-
- log.Info(c, "Claiming %d post(s) for %s...", len(*localPosts), u.User.Username)
- results, err := api.ClaimPosts(c, localPosts)
- if err != nil {
- return cli.NewExitError(fmt.Sprintf("Failed to claim posts: %v", err), 1)
- }
-
- var okCount, errCount int
- for _, r := range *results {
- id := r.ID
- if id == "" {
- // No top-level ID, so the claim was successful
- id = r.Post.ID
- }
- status := fmt.Sprintf("Post %s...", id)
- if r.ErrorMessage != "" {
- log.Errorln("%serror: %v", status, r.ErrorMessage)
- errCount++
- } else {
- log.Info(c, "%sOK", status)
- okCount++
- // only delete local if successful
- api.RemovePost(c.App.ExtraInfo()["configDir"], id)
+ fmt.Printf("%s/%s%s ", base, p.ID, ext)
}
+ fmt.Print("\n")
}
- log.Info(c, "%d claimed, %d failed", okCount, errCount)
return nil
}
func CmdAuth(c *cli.Context) error {
// Check configuration
u, err := config.LoadUser(config.UserDataDir(c.App.ExtraInfo()["configDir"]))
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 ", 1)
}
fmt.Print("Password: ")
pass, err := gopass.GetPasswdMasked()
if err != nil {
return cli.NewExitError(fmt.Sprintf("error reading password: %v", err), 1)
}
// Validate password
if len(pass) == 0 {
return cli.NewExitError("Please enter your password.", 1)
}
err = api.DoLogIn(c, username, string(pass))
if err != nil {
return cli.NewExitError(fmt.Sprintf("error logging in: %v", err), 1)
}
return nil
}
func CmdLogOut(c *cli.Context) error {
return api.DoLogOut(c)
}
diff --git a/config/options.go b/config/options.go
index 1abf9ee..9b717bd 100644
--- a/config/options.go
+++ b/config/options.go
@@ -1,56 +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 = "2.0"
+ 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
index 21dd8f9..d7039f1 100644
--- a/config/user.go
+++ b/config/user.go
@@ -1,47 +1,47 @@
package config
import (
"encoding/json"
"io/ioutil"
"path/filepath"
- writeas "github.com/writeas/go-writeas/v2"
"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 346f6ef..ec850e6 100644
--- a/go.mod
+++ b/go.mod
@@ -1,25 +1,26 @@
module github.com/writeas/writeas-cli
require (
- code.as/core/socks v1.0.0
+ 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/go-writeas/v2 v2.0.0
+ 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 d135529..9662d3c 100644
--- a/go.sum
+++ b/go.sum
@@ -1,69 +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=
-code.as/core/socks v1.0.0 h1:SPQXNp4SbEwjOAP9VzUahLHak8SDqy5n+9cm9tpjZOs=
-code.as/core/socks v1.0.0/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 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
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/go-writeas/v2 v2.0.0 h1:KjDI5bQSAIH0IzkKW3uGoY98I1A4DrBsSqBklgyOvHw=
-github.com/writeas/go-writeas/v2 v2.0.0/go.mod h1:9sjczQJKmru925fLzg0usrU1R1tE4vBmQtGnItUMR0M=
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/impart v1.1.0 h1:nPnoO211VscNkp/gnzir5UwCDEvdHThL5uELU60NFSE=
-github.com/writeas/impart v1.1.0/go.mod h1:g0MpxdnTOHHrl+Ca/2oMXUHJ0PcRAEWtkCzYCJUXC9Y=
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 h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
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 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
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=