fix log

macdylan · Sep 5, 2023 · 3cae5bb · 3cae5bb
1 parent 2c99a44
commit 3cae5bb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/connector.go b/connector.go
@@ -34,7 +34,7 @@ func (p *Payload) ReadableSize() string {
 
 func (p *Payload) GetContent(nofix bool) (cont []byte, err error) {
 	defer runtime.GC()
-	if nofix || !shouldBeFix(p.Name) {
+	if nofix || !p.ShouldBeFix() {
 		cont, err = io.ReadAll(p.File)
 	} else {
 		cont, err = postProcess(p.File)
@@ -43,6 +43,10 @@ func (p *Payload) GetContent(nofix bool) (cont []byte, err error) {
 	return cont, err
 }
 
+func (p *Payload) ShouldBeFix() bool {
+	return shouldBeFix(p.Name)
+}
+
 func NewPayload(file io.Reader, name string, size int64) *Payload {
 	return &Payload{
 		File: file,

diff --git a/connector_http.go b/connector_http.go
@@ -145,7 +145,7 @@ func (hc *HTTPConnector) Upload(payload *Payload) (err error) {
 					log.SetOutput(os.Stderr)
 					if err != nil {
 						log.Printf("G-Code fix error(ignored): %s", err)
-					} else {
+					} else if payload.ShouldBeFix() {
 						log.Printf("G-Code fixed")
 					}
 					log.SetOutput(w)

diff --git a/connector_sacp.go b/connector_sacp.go
@@ -52,7 +52,7 @@ func (sc *SACPConnector) Upload(payload *Payload) (err error) {
 	if !NoFix {
 		if err != nil {
 			log.Printf("G-Code fix error(ignored): %s", err)
-		} else {
+		} else if payload.ShouldBeFix() {
 			log.Printf("G-Code fixed")
 		}
 	}