Browse Source

Door changes thanks to staticcheck.

Steve Thielemann 3 years ago
parent
commit
37f373b6bc
4 changed files with 17 additions and 13 deletions
  1. 9 7
      door/door.go
  2. 2 0
      door/input.go
  3. 5 5
      door/menu_test.go
  4. 1 1
      door/panel.go

+ 9 - 7
door/door.go

@@ -144,11 +144,13 @@ type Door struct {
 
 // Return the amount of time left as time.Duration
 func (d *Door) TimeLeft() time.Duration {
-	return d.TimeOut.Sub(time.Now())
+	return time.Until(d.TimeOut)
+	// return d.TimeOut.Sub(time.Now())
 }
 
 func (d *Door) TimeUsed() time.Duration {
-	return time.Now().Sub(d.StartTime)
+	return time.Since(d.StartTime)
+	// return time.Now().Sub(d.StartTime)
 }
 
 // Read the BBS door file.  We only support door32.sys.
@@ -217,16 +219,16 @@ func (d *Door) detect() {
 		return
 	}
 
-	if ((strings.Index(results, "1;1R") != -1) ||
-		(strings.Index(results, "1;3R") != -1)) &&
-		((strings.Index(results, "2:2R") != -1) ||
-			(strings.Index(results, "2;3R") != -1)) {
+	if (strings.Contains(results, "1;1R") ||
+		strings.Contains(results, "1;3R")) &&
+		(strings.Contains(results, "2:2R") ||
+			strings.Contains(results, "2;3R")) {
 		Unicode = true
 	} else {
 		Unicode = false
 		CP437 = true
 	}
-	if strings.Index(results, "1;3R") != -1 {
+	if strings.Contains(results, "1;3R") {
 		Full_CP437 = true
 	}
 

+ 2 - 0
door/input.go

@@ -41,9 +41,11 @@ func set(fdSetPtr *syscall.FdSet, fd int) {
 	(*fdSetPtr).Bits[fd/64] |= 1 << uint64(fd%64)
 }
 
+/*
 func isSet(fdSetPtr *syscall.FdSet, fd int) bool {
 	return ((*fdSetPtr).Bits[fd/64] & (1 << uint64(fd%64))) != 0
 }
+*/
 
 func clearAll(fdSetPtr *syscall.FdSet) {
 	for index, _ := range (*fdSetPtr).Bits {

+ 5 - 5
door/menu_test.go

@@ -178,7 +178,7 @@ func TestMenuConnection(t *testing.T) {
 	server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
 	r, err = server.Read(buffer)
 	server.SetReadDeadline(time.Time{})
-	output = string(buffer[:r])
+	// output = string(buffer[:r])
 
 	// Test HOME, END, selecting an option, 8 & 2.
 
@@ -196,7 +196,7 @@ func TestMenuConnection(t *testing.T) {
 	server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
 	r, err = server.Read(buffer)
 	server.SetReadDeadline(time.Time{})
-	output = string(buffer[:r])
+	// output = string(buffer[:r])
 
 	keys = "\x00\x47\r" // HOME, ENTER
 	server.Write([]byte(keys))
@@ -212,7 +212,7 @@ func TestMenuConnection(t *testing.T) {
 	server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
 	r, err = server.Read(buffer)
 	server.SetReadDeadline(time.Time{})
-	output = string(buffer[:r])
+	// output = string(buffer[:r])
 
 	server.Write([]byte("B"))
 	m.Chosen = 0
@@ -227,7 +227,7 @@ func TestMenuConnection(t *testing.T) {
 	server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
 	r, err = server.Read(buffer)
 	server.SetReadDeadline(time.Time{})
-	output = string(buffer[:r])
+	// output = string(buffer[:r])
 
 	keys = "2\r" // "Down", ENTER
 	server.Write([]byte(keys))
@@ -243,6 +243,6 @@ func TestMenuConnection(t *testing.T) {
 	server.SetReadDeadline(time.Now().Add(time.Millisecond * 50))
 	r, err = server.Read(buffer)
 	server.SetReadDeadline(time.Time{})
-	output = string(buffer[:r])
+	// output = string(buffer[:r])
 
 }

+ 1 - 1
door/panel.go

@@ -90,7 +90,7 @@ func (p *Panel) Update() string {
 		col++
 	}
 
-	for idx, _ := range p.Lines {
+	for idx := range p.Lines {
 		if p.Lines[idx].Update() {
 			// Yes, line was updated
 			output += Goto(col, row) + p.Lines[idx].Output()