Browse Source

Fix formatting

master
Matt Baer 9 years ago
parent
commit
2c206cee2d
3 changed files with 30 additions and 30 deletions
  1. +1
    -1
      store/random.go
  2. +4
    -4
      store/store.go
  3. +25
    -25
      write-telnet.go

+ 1
- 1
store/random.go View File

@@ -16,7 +16,7 @@ func GenerateRandomString(dictionary string, l int) string {
var bytes = make([]byte, l)
rand.Read(bytes)
for k, v := range bytes {
bytes[k] = dictionary[v%byte(len(dictionary))]
bytes[k] = dictionary[v%byte(len(dictionary))]
}
return string(bytes)
}

+ 4
- 4
store/store.go View File

@@ -1,9 +1,9 @@
package store

import (
"os"
"io"
"bytes"
"io"
"os"
)

const (
@@ -16,9 +16,9 @@ func SavePost(outDir string, post []byte) (string, error) {
if err != nil {
return "", err
}
defer f.Close()
out := post[:0]
for _, b := range post {
if b < 32 && b != 10 && b != 13 {


+ 25
- 25
write-telnet.go View File

@@ -1,32 +1,32 @@
package main

import (
"fmt"
"net"
"bytes"
"flag"
"fmt"
"io/ioutil"
"net"
"os/exec"
"flag"

"github.com/writeas/writeas-telnet/store"
)

var (
banner []byte
outDir string
banner []byte
outDir string
staticDir string
debugging bool
rsyncHost string
)

const (
colBlue = "\033[0;34m"
colGreen = "\033[0;32m"
colBlue = "\033[0;34m"
colGreen = "\033[0;32m"
colBGreen = "\033[1;32m"
colCyan = "\033[0;36m"
colBRed = "\033[1;31m"
colBold = "\033[1;37m"
noCol = "\033[0m"
colCyan = "\033[0;36m"
colBRed = "\033[1;31m"
colBold = "\033[1;37m"
noCol = "\033[0m"

hr = "————————————————————————————————————————————————————————————————————————————————"
)
@@ -50,7 +50,7 @@ func main() {
fmt.Printf("Static directory : %s\n", staticDir)
fmt.Printf("rsync host : %s\n", rsyncHost)
fmt.Printf("Debugging enabled : %t\n\n", debugging)
fmt.Print("Initializing...")
var err error
banner, err = ioutil.ReadFile(staticDir + "/banner.txt")
@@ -58,7 +58,7 @@ func main() {
fmt.Println(err)
}
fmt.Println("DONE")
ln, err := net.Listen("tcp", fmt.Sprintf(":%d", *portPtr))
if err != nil {
panic(err)
@@ -71,7 +71,7 @@ func main() {
fmt.Println(err)
continue
}
go handleConnection(conn)
}
}
@@ -98,17 +98,17 @@ func handleConnection(c net.Conn) {
outputBytes(c, banner)
output(c, fmt.Sprintf("\n%sWelcome to write.as!%s\n", colBGreen, noCol))
output(c, fmt.Sprintf("If this is freaking you out, you can get notified of the %sbrowser-based%s launch\ninstead at https://write.as.\n\n", colBold, noCol))
waitForEnter(c)
c.Close()
fmt.Printf("Connection from %v closed.\n", c.RemoteAddr())
}

func waitForEnter(c net.Conn) {
b := make([]byte, 4)
output(c, fmt.Sprintf("%sPress Enter to continue...%s\n", colBRed, noCol))
for {
n, err := c.Read(b)
@@ -126,7 +126,7 @@ func waitForEnter(c net.Conn) {
break
}
}
output(c, fmt.Sprintf("Enter anything you like.\nPress %sCtrl-D%s to publish and quit.\n%s\n", colBold, noCol, hr))
readInput(c)
}
@@ -137,15 +137,15 @@ func checkExit(b []byte, n int) bool {

func readInput(c net.Conn) {
defer c.Close()
b := make([]byte, 4096)
var post bytes.Buffer
for {
n, err := c.Read(b)
post.Write(b[0:n])
if debugging {
fmt.Print(b[0:n])
fmt.Printf("\n%d: %s\n", n, b[0:n])
@@ -162,14 +162,14 @@ func readInput(c net.Conn) {

if rsyncHost != "" {
output(c, "\nPosting to secure site...")
exec.Command("rsync", "-ptgou", outDir + "/" + file, rsyncHost + ":").Run()
exec.Command("rsync", "-ptgou", outDir+"/"+file, rsyncHost+":").Run()
output(c, fmt.Sprintf("\nPosted! View at %shttps://write.as/%s%s", colBlue, file, noCol))
}

output(c, "\nSee you later.\n\n")
break
}
if err != nil || n == 0 {
break
}


Loading…
Cancel
Save