Page MenuHomeMusing Studio
Files F10455463

No OneTemporary
Actions

View Options

diff --git a/cmd/wf/main.go b/cmd/wf/main.go
index ac726cf..5729d44 100644
--- a/cmd/wf/main.go
+++ b/cmd/wf/main.go
@@ -1,275 +1,275 @@
package main
import (
"os"
"github.com/writeas/writeas-cli/commands"
"github.com/writeas/writeas-cli/config"
cli "gopkg.in/urfave/cli.v1"
)
func main() {
appInfo := map[string]string{
"configDir": configDir,
"version": "1.0",
}
config.DirMustExist(config.UserDataDir(appInfo["configDir"]))
cli.VersionFlag = cli.BoolFlag{
Name: "version, V",
Usage: "print the version",
}
// Run the app
app := cli.NewApp()
app.Name = "wf"
app.Version = appInfo["version"]
app.Usage = "Publish to any WriteFreely instance from the command-line."
// TODO: who is the author? the contributors? link to GH?
app.Authors = []cli.Author{
{
Name: "Write.as",
Email: "hello@write.as",
},
}
app.ExtraInfo = func() map[string]string {
return appInfo
}
app.Action = requireAuth(commands.CmdPost, "publish")
app.Flags = append(config.PostFlags, flags...)
app.Commands = []cli.Command{
{
Name: "post",
Usage: "Alias for default action: create post from stdin",
Action: requireAuth(commands.CmdPost, "publish"),
Flags: config.PostFlags,
Description: `Create a new post on WriteFreely 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, 'wf' will show you the temporary file
location and how to pipe it to 'wf' to retry.`,
Action: requireAuth(commands.CmdNew, "publish"),
Flags: config.PostFlags,
},
{
Name: "publish",
Usage: "Publish a file",
Action: requireAuth(commands.CmdPublish, "publish"),
Flags: config.PostFlags,
},
{
Name: "delete",
Usage: "Delete a post",
- Action: requireAuth(commands.CmdDelete, "delete"),
+ Action: requireAuth(commands.CmdDelete, "delete a post"),
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: requireAuth(commands.CmdUpdate, "update"),
+ Action: requireAuth(commands.CmdUpdate, "update a post"),
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: "posts",
Usage: "List all of your posts",
Description: "This will list only local posts.",
- Action: requireAuth(commands.CmdListPosts, "posts"),
+ Action: requireAuth(commands.CmdListPosts, "view posts"),
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",
},
cli.BoolFlag{
Name: "verbose, v",
Usage: "Show verbose post listing, including Edit Tokens",
},
},
}, {
Name: "blogs",
Usage: "List blogs",
- Action: requireAuth(commands.CmdCollections, "blogs"),
+ Action: requireAuth(commands.CmdCollections, "view blogs"),
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: "url",
Usage: "Show list with URLs",
},
},
}, {
Name: "claim",
Usage: "Claim local unsynced posts",
- Action: requireAuth(commands.CmdClaim, "claim"),
+ Action: requireAuth(commands.CmdClaim, "claim unsynced posts"),
Description: "This will claim any unsynced posts local to this machine. To see which posts these are run: wf posts.",
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: "accounts",
Usage: "List all currently logged in accounts",
Action: cmdAccounts,
Flags: []cli.Flag{
cli.BoolFlag{
Name: "verbose, v",
Usage: "Make the operation more talkative",
},
},
}, {
Name: "auth",
Usage: "Authenticate with a WriteFreely instance",
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 a WriteFreely instance",
Action: requireAuth(cmdLogOut, "logout"),
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:
wf {{.Name}}{{if .Flags}} [command options]{{end}} [arguments...]{{if .Description}}
DESCRIPTION:
{{.Description}}{{end}}{{if .Flags}}
OPTIONS:
{{range .Flags}}{{.}}
{{end}}{{ end }}
`
app.Run(os.Args)
}
diff --git a/config/options.go b/config/options.go
index 4232bf9..9a163a6 100644
--- a/config/options.go
+++ b/config/options.go
@@ -1,112 +1,108 @@
package config
import (
"strings"
"github.com/cloudfoundry/jibber_jabber"
"github.com/writeas/writeas-cli/log"
cli "gopkg.in/urfave/cli.v1"
)
// Application constants.
const (
writeasUserAgent = "writeas-cli v"
wfUserAgent = "wf-cli v"
// Defaults for posts on Write.as.
DefaultFont = PostFontMono
WriteasBaseURL = "https://write.as"
DevBaseURL = "https://development.write.as"
TorBaseURL = "http://writeas7pm7rcdqg.onion"
torPort = 9150
)
func UserAgent(c *cli.Context) string {
client := wfUserAgent
if c.App.Name == "writeas" {
client = writeasUserAgent
}
ua := c.String("user-agent")
if ua == "" {
return client + c.App.ExtraInfo()["version"]
}
return ua + " (" + client + c.App.ExtraInfo()["version"] + ")"
}
func IsTor(c *cli.Context) bool {
return c.Bool("tor") || c.Bool("t")
}
func TorPort(c *cli.Context) int {
if c.IsSet("tor-port") && c.Int("tor-port") != 0 {
return c.Int("tor-port")
}
return torPort
}
func TorURL(c *cli.Context) string {
flagHost := c.String("host")
if flagHost != "" && strings.HasSuffix(flagHost, "onion") {
return flagHost
}
cfg, _ := LoadConfig(c.App.ExtraInfo()["configDir"])
if cfg != nil && cfg.Default.Host != "" && strings.HasSuffix(cfg.Default.Host, "onion") {
return cfg.Default.Host
}
return TorBaseURL
}
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
}
- u, _ := LoadUser(c)
- if u != nil {
- return u.User.Username
- }
return ""
}
// HostDirectory returns the sub directory string for the host. Order of
// precedence is a host flag if any, then the configured default, if any
func HostDirectory(c *cli.Context) (string, error) {
cfg, err := LoadConfig(UserDataDir(c.App.ExtraInfo()["configDir"]))
if err != nil {
return "", err
}
// flag takes precedence over defaults
if hostFlag := c.GlobalString("host"); hostFlag != "" {
if parts := strings.Split(hostFlag, "://"); len(parts) > 1 {
return parts[1], nil
}
return hostFlag, nil
}
if cfg.Default.Host != "" && cfg.Default.User != "" {
if parts := strings.Split(cfg.Default.Host, "://"); len(parts) > 1 {
return parts[1], nil
}
return cfg.Default.Host, nil
}
return "", nil
}

File Metadata

Mime Type
text/x-diff
Expires
Fri, Jan 31, 9:53 AM (4 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3145724

Event Timeline

musing studio · developers