✨ | Added "format" option

imf4ll · imf4ll · commit ec665f7a706c · 2022-06-04T12:13:40.000-03:00
diff --git a/modes/display.go b/modes/display.go
@@ -8,7 +8,7 @@ import (
     "github.com/go-vgo/robotgo"
 )
 
-func Display(save string, clipboard, output, upload bool, display int) {
+func Display(save, format string, clipboard, output, upload bool, display int) {
     var screenshot image.Image
 
     displays := utils.GetDisplays()
@@ -20,7 +20,7 @@ func Display(save string, clipboard, output, upload bool, display int) {
 
     displaySelected := displays[display]
 
-    screenshot = robotgo.CaptureImg(
+    screenshot = robotgo.CaptureImg (
         displaySelected.X,
         displaySelected.Y,
         displaySelected.Width,
@@ -40,12 +40,12 @@ func Display(save string, clipboard, output, upload bool, display int) {
     }
 
     if output {
-        utils.OutputToStdout(screenshot)
+        utils.OutputToStdout(screenshot, format)
 
     }
 
     if upload {
-        utils.UploadImage(screenshot)
+        utils.UploadImage(screenshot, format)
 
     }
 }
diff --git a/modes/fullscreen.go b/modes/fullscreen.go
@@ -5,7 +5,7 @@ import (
     "github.com/z3oxs/ghost/utils"
 )
 
-func Fullscreen(save string, clipboard, output, upload bool) {
+func Fullscreen(save, format string, clipboard, output, upload bool) {
     screenshot := robotgo.CaptureImg()
 
     utils.PlaySound("/opt/ghost/screenshot.wav")
@@ -21,12 +21,12 @@ func Fullscreen(save string, clipboard, output, upload bool) {
     }
 
     if output {
-        utils.OutputToStdout(screenshot)
+        utils.OutputToStdout(screenshot, format)
 
     }
 
     if upload {
-        utils.UploadImage(screenshot)
+        utils.UploadImage(screenshot, format)
 
     }
 }
diff --git a/modes/selection.go b/modes/selection.go
@@ -7,7 +7,7 @@ import (
     "github.com/z3oxs/ghost/utils"
 )
 
-func Selection(save string, clipboard, output, upload bool) {
+func Selection(save, format string, clipboard, output, upload bool) {
     var x1, x2, y1, y2 int
     var screenshot image.Image
 
@@ -46,12 +46,12 @@ func Selection(save string, clipboard, output, upload bool) {
     }
 
     if output {
-        utils.OutputToStdout(screenshot)
+        utils.OutputToStdout(screenshot, format)
 
     }
 
     if upload {
-        utils.UploadImage(screenshot)
+        utils.UploadImage(screenshot, format)
 
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"github.com/go-vgo/robotgo"`
`9`	`9`	`)`
`10`	`10`
`11`		`-func Display(save string, clipboard, output, upload bool, display int) {`
	`11`	`+func Display(save, format string, clipboard, output, upload bool, display int) {`
`12`	`12`	`var screenshot image.Image`
`13`	`13`
`14`	`14`	`displays := utils.GetDisplays()`
`@@ -20,7 +20,7 @@ func Display(save string, clipboard, output, upload bool, display int) {`
`20`	`20`
`21`	`21`	`displaySelected := displays[display]`
`22`	`22`
`23`		`- screenshot = robotgo.CaptureImg(`
	`23`	`+ screenshot = robotgo.CaptureImg (`
`24`	`24`	`displaySelected.X,`
`25`	`25`	`displaySelected.Y,`
`26`	`26`	`displaySelected.Width,`
`@@ -40,12 +40,12 @@ func Display(save string, clipboard, output, upload bool, display int) {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`if output {`
`43`		`- utils.OutputToStdout(screenshot)`
	`43`	`+ utils.OutputToStdout(screenshot, format)`
`44`	`44`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`if upload {`
`48`		`- utils.UploadImage(screenshot)`
	`48`	`+ utils.UploadImage(screenshot, format)`
`49`	`49`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"github.com/z3oxs/ghost/utils"`
`6`	`6`	`)`
`7`	`7`
`8`		`-func Fullscreen(save string, clipboard, output, upload bool) {`
	`8`	`+func Fullscreen(save, format string, clipboard, output, upload bool) {`
`9`	`9`	`screenshot := robotgo.CaptureImg()`
`10`	`10`
`11`	`11`	`utils.PlaySound("/opt/ghost/screenshot.wav")`
`@@ -21,12 +21,12 @@ func Fullscreen(save string, clipboard, output, upload bool) {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`if output {`
`24`		`- utils.OutputToStdout(screenshot)`
	`24`	`+ utils.OutputToStdout(screenshot, format)`
`25`	`25`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`if upload {`
`29`		`- utils.UploadImage(screenshot)`
	`29`	`+ utils.UploadImage(screenshot, format)`
`30`	`30`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"github.com/z3oxs/ghost/utils"`
`8`	`8`	`)`
`9`	`9`
`10`		`-func Selection(save string, clipboard, output, upload bool) {`
	`10`	`+func Selection(save, format string, clipboard, output, upload bool) {`
`11`	`11`	`var x1, x2, y1, y2 int`
`12`	`12`	`var screenshot image.Image`
`13`	`13`
`@@ -46,12 +46,12 @@ func Selection(save string, clipboard, output, upload bool) {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`if output {`
`49`		`- utils.OutputToStdout(screenshot)`
	`49`	`+ utils.OutputToStdout(screenshot, format)`
`50`	`50`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`if upload {`
`54`		`- utils.UploadImage(screenshot)`
	`54`	`+ utils.UploadImage(screenshot, format)`
`55`	`55`
`56`	`56`	`}`
`57`	`57`	`}`