Refactor according to lint
This commit is contained in:
parent
73b33f5872
commit
65b9241492
120
dau.go
120
dau.go
@ -1,49 +1,52 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
"github.com/pborman/getopt"
|
||||
"path/filepath"
|
||||
"os"
|
||||
"time"
|
||||
"net/http"
|
||||
"log"
|
||||
"io"
|
||||
"bytes"
|
||||
"mime/multipart"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"log"
|
||||
"mime/multipart"
|
||||
"net/http"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/pborman/getopt"
|
||||
)
|
||||
|
||||
const current_version = "0.4"
|
||||
const currentVersion = "0.4"
|
||||
|
||||
var last_check = time.Now()
|
||||
var new_last_check = time.Now()
|
||||
var lastCheck = time.Now()
|
||||
var newLastCheck = time.Now()
|
||||
|
||||
var webhook_url string
|
||||
var webhookURL string
|
||||
var username string
|
||||
|
||||
func main() {
|
||||
webhook_opt, path, watch, username_opt := parse_options()
|
||||
webhook_url = webhook_opt
|
||||
username = username_opt
|
||||
webhookOpt, path, watch, usernameOpt := parseOptions()
|
||||
webhookURL = webhookOpt
|
||||
username = usernameOpt
|
||||
|
||||
check_path(path)
|
||||
check_updates()
|
||||
checkPath(path)
|
||||
checkUpdates()
|
||||
|
||||
log.Print("Waiting for images to appear in ", path)
|
||||
|
||||
// wander the path, forever
|
||||
for {
|
||||
err := filepath.Walk(path, check_file)
|
||||
if err != nil { log.Fatal("could not watch path", err) }
|
||||
last_check = new_last_check
|
||||
err := filepath.Walk(path, checkFile)
|
||||
if err != nil {
|
||||
log.Fatal("could not watch path", err)
|
||||
}
|
||||
lastCheck = newLastCheck
|
||||
time.Sleep(time.Duration(watch) * time.Second)
|
||||
}
|
||||
}
|
||||
|
||||
func check_path(path string) {
|
||||
func checkPath(path string) {
|
||||
src, err := os.Stat(path)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
@ -54,35 +57,35 @@ func check_path(path string) {
|
||||
}
|
||||
}
|
||||
|
||||
func check_updates() {
|
||||
func checkUpdates() {
|
||||
|
||||
type GithubRelease struct {
|
||||
Html_url string
|
||||
Tag_name string
|
||||
HTMLURL string
|
||||
TagName string
|
||||
Name string
|
||||
Body string
|
||||
}
|
||||
|
||||
client := &http.Client{Timeout: time.Second * 5}
|
||||
resp, err := client.Get("https://api.github.com/repos/tardisx/discord-auto-upload/releases/latest")
|
||||
if (err != nil) {
|
||||
if err != nil {
|
||||
log.Fatal("could not check for updates:", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
body, err := ioutil.ReadAll(resp.Body)
|
||||
if (err != nil) {
|
||||
if err != nil {
|
||||
log.Fatal("could not check read update response")
|
||||
}
|
||||
|
||||
var latest GithubRelease
|
||||
err = json.Unmarshal(body, &latest)
|
||||
|
||||
if (err != nil) {
|
||||
if err != nil {
|
||||
log.Fatal("could not parse JSON: ", err)
|
||||
}
|
||||
|
||||
if (current_version < latest.Tag_name) {
|
||||
fmt.Printf("You are currently on version %s, but version %s is available\n", current_version, latest.Tag_name)
|
||||
if currentVersion < latest.TagName {
|
||||
fmt.Printf("You are currently on version %s, but version %s is available\n", currentVersion, latest.TagName)
|
||||
fmt.Println("----------- Release Info -----------")
|
||||
fmt.Println(latest.Body)
|
||||
fmt.Println("------------------------------------")
|
||||
@ -90,7 +93,7 @@ func check_updates() {
|
||||
|
||||
}
|
||||
|
||||
func parse_options() (webhook_url string, path string, watch int, username string) {
|
||||
func parseOptions() (webhookURL string, path string, watch int, username string) {
|
||||
|
||||
// Declare the flags to be used
|
||||
webhookFlag := getopt.StringLong("webhook", 'w', "", "discord webhook URL")
|
||||
@ -103,14 +106,14 @@ func parse_options() (webhook_url string, path string, watch int, username strin
|
||||
|
||||
getopt.Parse()
|
||||
|
||||
if (*helpFlag) {
|
||||
if *helpFlag {
|
||||
getopt.PrintUsage(os.Stderr)
|
||||
os.Exit(0)
|
||||
}
|
||||
|
||||
if (*versionFlag) {
|
||||
if *versionFlag {
|
||||
fmt.Println("dau - https://github.com/tardisx/discord-auto-upload")
|
||||
fmt.Printf("Version: %s\n", current_version)
|
||||
fmt.Printf("Version: %s\n", currentVersion)
|
||||
os.Exit(0)
|
||||
}
|
||||
|
||||
@ -126,24 +129,24 @@ func parse_options() (webhook_url string, path string, watch int, username strin
|
||||
return *webhookFlag, *pathFlag, int(*watchFlag), *usernameFlag
|
||||
}
|
||||
|
||||
func check_file(path string, f os.FileInfo, err error) error {
|
||||
func checkFile(path string, f os.FileInfo, err error) error {
|
||||
|
||||
if f.ModTime().After(last_check) && f.Mode().IsRegular() {
|
||||
if f.ModTime().After(lastCheck) && f.Mode().IsRegular() {
|
||||
|
||||
if file_eligible(path) {
|
||||
if fileEligible(path) {
|
||||
// process file
|
||||
process_file(path)
|
||||
processFile(path)
|
||||
}
|
||||
|
||||
if new_last_check.Before(f.ModTime()) {
|
||||
new_last_check = f.ModTime()
|
||||
if newLastCheck.Before(f.ModTime()) {
|
||||
newLastCheck = f.ModTime()
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func file_eligible(file string) (bool) {
|
||||
func fileEligible(file string) bool {
|
||||
extension := strings.ToLower(filepath.Ext(file))
|
||||
if extension == ".png" || extension == ".jpg" || extension == ".gif" {
|
||||
return true
|
||||
@ -151,18 +154,18 @@ func file_eligible(file string) (bool) {
|
||||
return false
|
||||
}
|
||||
|
||||
func process_file(file string) {
|
||||
func processFile(file string) {
|
||||
log.Print("Uploading ", file)
|
||||
|
||||
extraParams := map[string]string{}
|
||||
|
||||
if (username != "") {
|
||||
if username != "" {
|
||||
extraParams["username"] = username
|
||||
}
|
||||
|
||||
type DiscordAPIResponseAttachment struct {
|
||||
Url string
|
||||
Proxy_url string
|
||||
URL string
|
||||
ProxyURL string
|
||||
Size int
|
||||
Width int
|
||||
Height int
|
||||
@ -171,10 +174,10 @@ func process_file(file string) {
|
||||
|
||||
type DiscordAPIResponse struct {
|
||||
Attachments []DiscordAPIResponseAttachment
|
||||
Id int64 `json:",string"`
|
||||
ID int64 `json:",string"`
|
||||
}
|
||||
|
||||
request, err := newfileUploadRequest(webhook_url, extraParams, "file", file)
|
||||
request, err := newfileUploadRequest(webhookURL, extraParams, "file", file)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
@ -187,26 +190,26 @@ func process_file(file string) {
|
||||
|
||||
} else {
|
||||
|
||||
if (resp.StatusCode != 200) {
|
||||
if resp.StatusCode != 200 {
|
||||
log.Print("Bad response from server:", resp.StatusCode)
|
||||
return
|
||||
}
|
||||
|
||||
res_body, err := ioutil.ReadAll(resp.Body)
|
||||
if (err != nil) {
|
||||
resBody, err := ioutil.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
log.Fatal("could not deal with body", err)
|
||||
}
|
||||
resp.Body.Close()
|
||||
|
||||
var res DiscordAPIResponse
|
||||
err = json.Unmarshal(res_body, &res)
|
||||
err = json.Unmarshal(resBody, &res)
|
||||
|
||||
if (err != nil) {
|
||||
if err != nil {
|
||||
log.Print("could not parse JSON: ", err)
|
||||
fmt.Println("Response was:", string(res_body[:]))
|
||||
fmt.Println("Response was:", string(resBody[:]))
|
||||
return
|
||||
}
|
||||
if (len(res.Attachments) < 1) {
|
||||
if len(res.Attachments) < 1 {
|
||||
log.Print("bad response - no attachments?")
|
||||
return
|
||||
}
|
||||
@ -214,8 +217,8 @@ func process_file(file string) {
|
||||
elapsed := time.Since(start)
|
||||
rate := float64(a.Size) / elapsed.Seconds() / 1024.0
|
||||
|
||||
log.Printf("Uploaded to %s %dx%d", a.Url, a.Width, a.Height)
|
||||
log.Printf("id: %d, %d bytes transferred in %.2f seconds (%.2f KiB/s)", res.Id, a.Size, elapsed.Seconds(), rate)
|
||||
log.Printf("Uploaded to %s %dx%d", a.URL, a.Width, a.Height)
|
||||
log.Printf("id: %d, %d bytes transferred in %.2f seconds (%.2f KiB/s)", res.ID, a.Size, elapsed.Seconds(), rate)
|
||||
}
|
||||
|
||||
}
|
||||
@ -234,6 +237,9 @@ func newfileUploadRequest(uri string, params map[string]string, paramName, path
|
||||
return nil, err
|
||||
}
|
||||
_, err = io.Copy(part, file)
|
||||
if err != nil {
|
||||
log.Fatal("Could not copy: ", err)
|
||||
}
|
||||
|
||||
for key, val := range params {
|
||||
_ = writer.WriteField(key, val)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user