diff --git a/cmd/writeas/cli.go b/cmd/writeas/cli.go index a7e91da..f122d08 100644 --- a/cmd/writeas/cli.go +++ b/cmd/writeas/cli.go @@ -1,303 +1,319 @@ package main import ( "bufio" "gopkg.in/urfave/cli.v1" "io" "log" "os" ) // API constants for communicating with Write.as. const ( writeasBaseURL = "https://write.as" torBaseURL = "http://writeas7pm7rcdqg.onion" ) // Application constants. const ( version = "1.1" ) // 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: "verbose, v", Usage: "Make the operation more talkative", }, cli.StringFlag{ Name: "font", Usage: "Sets post font to given value", Value: defaultFont, }, 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: "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", }, }, }, + { + 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, + }, + }, + }, { 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.StringFlag{ Name: "u", Usage: "Username for authentication", Value: "", }, }, }, { 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.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 handlePost(fullPost []byte, c *cli.Context) 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/sync.go b/cmd/writeas/sync.go new file mode 100644 index 0000000..f5ec3b7 --- /dev/null +++ b/cmd/writeas/sync.go @@ -0,0 +1,112 @@ +package main + +import ( + //"github.com/writeas/writeas-cli/sync" + "fmt" + "github.com/writeas/writeas-cli/fileutils" + "gopkg.in/urfave/cli.v1" + "io/ioutil" + "os" + "path/filepath" +) + +const ( + postFileExt = ".txt" +) + +func cmdPull(c *cli.Context) error { + cfg, err := loadConfig() + if err != nil { + return err + } + // Create posts directory if needed + if cfg.Posts.Directory == "" { + syncSetUp(cfg) + } + + // Fetch posts + cl, err := newClient(c, true) + if err != nil { + return err + } + + posts, err := cl.GetUserPosts() + if err != nil { + return err + } + + for _, p := range *posts { + postFilename := p.ID + collDir := "" + if p.Collection != nil { + postFilename = p.Slug + // Create directory for collection + collDir = p.Collection.Alias + if !fileutils.Exists(filepath.Join(cfg.Posts.Directory, collDir)) { + 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) + continue + } + } + } + postFilename += postFileExt + + // Write file + err = ioutil.WriteFile(filepath.Join(cfg.Posts.Directory, collDir, postFilename), []byte(p.Content), 0644) + if err != nil { + Errorln("Error creating file %s: %s", postFilename, err) + } + 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) + } + } + + return nil +} + +// TODO: move UserConfig to its own package, and this to sync package +func syncSetUp(cfg *UserConfig) error { + // 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 + } + + // 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) + } + return err + } + fmt.Println("Created posts directory.") + } + + // Save preference + cfg.Posts.Directory = dir + err = saveConfig(cfg) + if err != nil { + if debug { + Errorln("Unable to save config: %s", err) + } + return err + } + fmt.Println("Saved config.") + + return nil +} diff --git a/cmd/writeas/userconfig.go b/cmd/writeas/userconfig.go index b8b5d64..f02fda0 100644 --- a/cmd/writeas/userconfig.go +++ b/cmd/writeas/userconfig.go @@ -1,84 +1,89 @@ package main import ( "encoding/json" "github.com/writeas/go-writeas" "github.com/writeas/writeas-cli/fileutils" "gopkg.in/ini.v1" "io/ioutil" "path/filepath" ) const ( userConfigFile = "config.ini" userFile = "user.json" ) type ( APIConfig struct { } + PostsConfig struct { + Directory string `ini:"directory"` + } + UserConfig struct { - API APIConfig `ini:"api"` + API APIConfig `ini:"api"` + Posts PostsConfig `ini:"posts"` } ) func loadConfig() (*UserConfig, error) { 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 }