- commit
- 50f4110
- parent
- 9d325fb
- author
- Antonio Mika
- date
- 2025-03-14 10:33:11 -0400 EDT
Fix feeds and remove deprecated notice for cli apps
5 files changed,
+26,
-24
+14,
-13
1@@ -14,9 +14,6 @@ func Middleware(dbpool db.DB, cfg *shared.ConfigSite) pssh.SSHServerMiddleware {
2 return func(next pssh.SSHServerHandler) pssh.SSHServerHandler {
3 return func(sesh *pssh.SSHServerConnSession) error {
4 args := sesh.Command()
5- if len(args) == 0 {
6- return next(sesh)
7- }
8
9 logger := pssh.GetLogger(sesh)
10 user := pssh.GetUser(sesh)
11@@ -27,29 +24,33 @@ func Middleware(dbpool db.DB, cfg *shared.ConfigSite) pssh.SSHServerMiddleware {
12 return err
13 }
14
15- cmd := args[0]
16+ cmd := "help"
17+ if len(args) > 0 {
18+ cmd = args[0]
19+ }
20+
21 if cmd == "help" {
22- fmt.Fprintf(sesh, "Commands: [help, ls, rm, run]\n\n")
23+ fmt.Fprintf(sesh, "Commands: [help, ls, rm, run]\r\n\r\n")
24 writer := tabwriter.NewWriter(sesh, 0, 0, 1, ' ', tabwriter.TabIndent)
25 fmt.Fprintln(writer, "Cmd\tDesc")
26 fmt.Fprintf(
27 writer,
28- "%s\t%s\n",
29+ "%s\t%s\r\n",
30 "help", "this help text",
31 )
32 fmt.Fprintf(
33 writer,
34- "%s\t%s\n",
35+ "%s\t%s\r\n",
36 "ls", "list feed digest posts with metadata",
37 )
38 fmt.Fprintf(
39 writer,
40- "%s\t%s\n",
41+ "%s\t%s\r\n",
42 "rm {filename}", "removes feed digest post",
43 )
44 fmt.Fprintf(
45 writer,
46- "%s\t%s\n",
47+ "%s\t%s\r\n",
48 "run {filename}", "runs the feed digest post immediately, ignoring last digest time validation",
49 )
50 return writer.Flush()
51@@ -71,7 +72,7 @@ func Middleware(dbpool db.DB, cfg *shared.ConfigSite) pssh.SSHServerMiddleware {
52 digestOption := DigestOptionToTime(*post.Data.LastDigest, parsed.DigestInterval)
53 fmt.Fprintf(
54 writer,
55- "%s\t%s\t%s\t%s\t%d/10\n",
56+ "%s\t%s\t%s\t%s\t%d/10\r\n",
57 post.Filename,
58 post.Data.LastDigest.Format(time.RFC3339),
59 digestOption.Format(time.RFC3339),
60@@ -82,7 +83,7 @@ func Middleware(dbpool db.DB, cfg *shared.ConfigSite) pssh.SSHServerMiddleware {
61 return writer.Flush()
62 } else if cmd == "rm" {
63 filename := args[1]
64- fmt.Fprintf(sesh, "removing digest post %s\n", filename)
65+ fmt.Fprintf(sesh, "removing digest post %s\r\n", filename)
66 write := false
67 if len(args) > 2 {
68 writeRaw := args[2]
69@@ -102,7 +103,7 @@ func Middleware(dbpool db.DB, cfg *shared.ConfigSite) pssh.SSHServerMiddleware {
70 fmt.Fprintln(sesh.Stderr(), err)
71 }
72 }
73- fmt.Fprintf(sesh, "digest post removed %s\n", filename)
74+ fmt.Fprintf(sesh, "digest post removed %s\r\n", filename)
75 if !write {
76 fmt.Fprintln(sesh, "WARNING: *must* append with `--write` for the changes to persist.")
77 }
78@@ -119,7 +120,7 @@ func Middleware(dbpool db.DB, cfg *shared.ConfigSite) pssh.SSHServerMiddleware {
79 fmt.Fprintln(sesh.Stderr(), err)
80 return err
81 }
82- fmt.Fprintf(sesh, "running feed post: %s\n", filename)
83+ fmt.Fprintf(sesh, "running feed post: %s\r\n", filename)
84 fetcher := NewFetcher(dbpool, cfg)
85 err = fetcher.RunPost(logger, user, post, true)
86 if err != nil {
+1,
-1
1@@ -61,7 +61,7 @@ func StartSshServer() {
2 scp.Middleware(handler),
3 rsync.Middleware(handler),
4 auth.Middleware(handler),
5- pssh.PtyMdw(pssh.DeprecatedNotice()),
6+ Middleware(dbh, cfg),
7 pssh.LogMiddleware(handler, dbh),
8 },
9 []pssh.SSHServerMiddleware{
+6,
-6
1@@ -33,7 +33,7 @@ func projectTable(sesh io.Writer, projects []*db.Project) {
2 }
3 fmt.Fprintf(
4 writer,
5- "%s\t%s\t%s\t%s\t%s\t%s\n",
6+ "%s\t%s\t%s\t%s\t%s\t%s\r\n",
7 project.Name,
8 project.UpdatedAt.Format("2006-01-02 15:04:05"),
9 links,
10@@ -126,8 +126,8 @@ func (c *Cmd) RmProjectAssets(projectName string) error {
11 }
12
13 func (c *Cmd) help() {
14- helpStr := "Commands: [help, stats, ls, fzf, rm, link, unlink, prune, retain, depends, acl, cache]\n"
15- helpStr += "NOTICE:" + " *must* append with `--write` for the changes to persist.\n"
16+ helpStr := "Commands: [help, stats, ls, fzf, rm, link, unlink, prune, retain, depends, acl, cache]\r\n"
17+ helpStr += "NOTICE:" + " *must* append with `--write` for the changes to persist.\r\n"
18 c.output(helpStr)
19 projectName := "projA"
20
21@@ -185,7 +185,7 @@ func (c *Cmd) help() {
22 writer := NewTabWriter(c.Session)
23 fmt.Fprintln(writer, "Cmd\tDescription")
24 for _, dat := range data {
25- fmt.Fprintf(writer, "%s\t%s\n", dat[0], dat[1])
26+ fmt.Fprintf(writer, "%s\t%s\r\n", dat[0], dat[1])
27 }
28 writer.Flush()
29 }
30@@ -219,7 +219,7 @@ func (c *Cmd) stats(cfgMaxSize uint64) error {
31 fmt.Fprintln(writer, "Used (GB)\tQuota (GB)\tUsed (%)\tProjects (#)")
32 fmt.Fprintf(
33 writer,
34- "%.4f\t%.4f\t%.4f\t%d\n",
35+ "%.4f\t%.4f\t%.4f\t%d\r\n",
36 utils.BytesToGB(int(totalFileSize)),
37 utils.BytesToGB(int(storageMax)),
38 (float32(totalFileSize)/float32(storageMax))*100,
39@@ -435,7 +435,7 @@ func (c *Cmd) prune(prefix string, keepNumLatest int) error {
40 }
41 }
42
43- c.output("\nsummary")
44+ c.output("\r\nsummary")
45 c.output("=======")
46 for _, project := range goodbye {
47 c.output(fmt.Sprintf("project (%s) removed", project.Name))
R pkg/apps/pgs/cli_wish.go =>
pkg/apps/pgs/cli_middleware.go
+5,
-3
1@@ -69,9 +69,6 @@ func Middleware(handler *UploadAssetHandler) pssh.SSHServerMiddleware {
2 return func(next pssh.SSHServerHandler) pssh.SSHServerHandler {
3 return func(sesh *pssh.SSHServerConnSession) error {
4 args := sesh.Command()
5- if len(args) == 0 {
6- return next(sesh)
7- }
8
9 // default width and height when no pty
10 width := 100
11@@ -105,6 +102,11 @@ func Middleware(handler *UploadAssetHandler) pssh.SSHServerMiddleware {
12 Cfg: handler.Cfg,
13 }
14
15+ if len(args) == 0 {
16+ opts.help()
17+ return nil
18+ }
19+
20 cmd := strings.TrimSpace(args[0])
21 if len(args) == 1 {
22 if cmd == "help" {
+0,
-1
1@@ -56,7 +56,6 @@ func StartSshServer(cfg *PgsConfig, killCh chan error) {
2 scp.Middleware(handler),
3 rsync.Middleware(handler),
4 auth.Middleware(handler),
5- pssh.PtyMdw(pssh.DeprecatedNotice()),
6 Middleware(handler),
7 pssh.LogMiddleware(handler, handler.Cfg.DB),
8 },