justin/discord-auto-upload
1
0
Fork 0
Code Issues 15 Pull Requests 1 Actions Packages Projects Releases 20 Wiki Activity

Mark watermarked images be uploaded, and make it an optional option.

Browse Source
This commit is contained in:
Justin Hawkins 2017-02-28 21:32:18 +10:30
parent 82ba3be742
commit 1ecac568f7
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dau.go
View File

@ -36,6 +36,7 @@ type Config struct {
path string path string
watch int watch int
username string username string
noWatermark bool
} }
func main() { func main() {
@ -113,6 +114,7 @@ func parseOptions() Config {
pathFlag := getopt.StringLong("directory", 'd', "", "directory to scan, optional, defaults to current directory") pathFlag := getopt.StringLong("directory", 'd', "", "directory to scan, optional, defaults to current directory")
watchFlag := getopt.Int16Long("watch", 's', 10, "time between scans") watchFlag := getopt.Int16Long("watch", 's', 10, "time between scans")
usernameFlag := getopt.StringLong("username", 'u', "", "username for the bot upload") usernameFlag := getopt.StringLong("username", 'u', "", "username for the bot upload")
noWatermarkFlag := getopt.BoolLong("nowatermark", 'n', "do not put a watermark on images before uploading")
helpFlag := getopt.BoolLong("help", 'h', "help") helpFlag := getopt.BoolLong("help", 'h', "help")
versionFlag := getopt.BoolLong("version", 'v', "show version") versionFlag := getopt.BoolLong("version", 'v', "show version")
getopt.SetParameters("") getopt.SetParameters("")
@ -143,6 +145,7 @@ func parseOptions() Config {
newConfig.webhookURL = *webhookFlag newConfig.webhookURL = *webhookFlag
newConfig.watch = int(*watchFlag) newConfig.watch = int(*watchFlag)
newConfig.username = *usernameFlag newConfig.username = *usernameFlag
newConfig.noWatermark = *noWatermarkFlag
return newConfig return newConfig
} }
@ -174,9 +177,10 @@ func fileEligible(config Config, file string) bool {
func processFile(config Config, file string) { func processFile(config Config, file string) {
if !config.noWatermark {
log.Print("Munging ", file) log.Print("Munging ", file)
file = mungeFile(file)
mungeFile(file) }
log.Print("Uploading ", file) log.Print("Uploading ", file)
@ -242,6 +246,10 @@ func processFile(config Config, file string) {
log.Printf("Uploaded to %s %dx%d", a.URL, a.Width, a.Height) 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("id: %d, %d bytes transferred in %.2f seconds (%.2f KiB/s)", res.ID, a.Size, elapsed.Seconds(), rate)
if !config.noWatermark {
os.Remove(file)
}
} }
} }
@ -277,7 +285,7 @@ func newfileUploadRequest(uri string, params map[string]string, paramName, path
return req, err return req, err
} }
func mungeFile(path string) { func mungeFile(path string) string {
reader, err := os.Open(path) reader, err := os.Open(path)
if err != nil { if err != nil {
@ -308,5 +316,14 @@ func mungeFile(path string) {
dc.DrawString("github.com/tardisx/discord-auto-upload", 5.0, float64(bounds.Max.Y)-5.0) dc.DrawString("github.com/tardisx/discord-auto-upload", 5.0, float64(bounds.Max.Y)-5.0)
dc.SavePNG("../out.png") tempfile, err := ioutil.TempFile("", "dau")
if err != nil {
log.Fatal(err)
}
tempfile.Close()
os.Remove(tempfile.Name())
actualName := tempfile.Name() + ".png"
dc.SavePNG(actualName)
return actualName
} }