X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=main.go;h=a54a14ba6fd54698b7e46c2a720e972bd9c977ee;hb=HEAD;hp=b52d52ab1a3f5f27a7e179124f2690bc9a6c640e;hpb=4a1c37540658a82e4c5f697d46f7c63ef8dc05e8;p=mmfileget.git

diff --git a/main.go b/main.go
index b52d52a..a54a14b 100644
--- a/main.go
+++ b/main.go
@@ -3,64 +3,65 @@ package main
 import (
 	"fmt"
 	"io/ioutil"
+	"log"
 	"os"
-	"path/filepath"
+	"strconv"
 	"strings"
 
-	"github.com/mattermost/mattermost-server/v5/model"
+	"github.com/mattermost/mattermost-server/v6/model"
 )
 
 func main() {
+	log.SetFlags(0)
 	url := strings.TrimPrefix(os.Args[1], "-") // -?https://MACHINE/api/v4/files/FILE
 	s := strings.Split(url, "/")
 	machine, fileId := s[2], s[6]
 
-	netrcPath, ok := os.LookupEnv("NETRC")
-	if !ok {
-		netrcPath = filepath.Join(os.Getenv("HOME"), ".netrc")
-	}
-	data, err := ioutil.ReadFile(netrcPath)
-	if err != nil {
-		panic(err)
-	}
-	var login string
-	var password string
-	for _, line := range strings.Split(string(data), "\n") {
-		if i := strings.Index(line, "#"); i >= 0 {
-			line = line[:i]
-		}
-		f := strings.Fields(line)
-		if len(f) >= 6 &&
-			f[0] == "machine" && f[1] == machine &&
-			f[2] == "login" && f[4] == "password" {
-			login, password = f[3], f[5]
-			break
-		}
-	}
+	login, password := findInNetrc(machine)
 	if login == "" || password == "" {
-		fmt.Fprintln(os.Stderr, "No credentials found for:", machine)
+		log.Println("No credentials found for:", machine)
 		os.Exit(1)
 	}
 
-	Client := model.NewAPIv4Client("https://" + machine)
-	Client.Login(login, password)
-	info, resp := Client.GetFileInfo(fileId)
+	client := model.NewAPIv4Client("https://" + machine)
+	_, _, err := client.Login(login, password)
+	if err != nil {
+		log.Fatalln(err)
+	}
+	info, resp, err := client.GetFileInfo(fileId)
+	if err != nil {
+		log.Fatalln(err)
+	}
 	if info == nil {
-		fmt.Fprintln(os.Stderr, resp)
+		fmt.Println(resp)
 		os.Exit(1)
 	}
 	filename := info.Name
 	if len(os.Args) > 2 {
 		filename = os.Args[2]
 	} else {
-		fmt.Fprintln(os.Stderr, "Name:", info.Name)
-		fmt.Fprintln(os.Stderr, "Type:", info.MimeType)
-		fmt.Fprintln(os.Stderr, "Size:", info.Size)
-		fmt.Fprintln(os.Stderr, "Download? Ctrl-D/C")
+		log.Println("Name:", info.Name)
+		log.Println("Type:", info.MimeType)
+		log.Println("Size:", info.Size)
+		log.Println("Download? Ctrl-D/C")
 		os.Stdin.Read(make([]byte, 1))
 	}
-	data, _ = Client.GetFile(fileId)
-	if err = ioutil.WriteFile(filename, data, os.FileMode(0666)); err != nil {
-		panic(err)
+	data, _, err := client.GetFile(fileId)
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	dstCtr := 0
+	dst := filename
+	for {
+		if _, err = os.Stat(dst); err != nil {
+			break
+		}
+		dst = filename + strconv.Itoa(dstCtr)
+		dstCtr++
+	}
+	if err := ioutil.WriteFile(dst, data, os.FileMode(0666)); err != nil {
+		log.Fatalln(err)
 	}
+	fmt.Println(dst)
 }