Merge branch 'master' of http://gogs.scratch.com:59515/bel/truckstop

config.json

@@ -34,7 +34,7 @@
       "Pickup": false,
       "Dropoff": false,
       "Pathed": {
-         "Enabled": true,
+         "Enabled": false,
          "DirectionsURIFormat": "https://maps.googleapis.com/maps/api/directions/json?origin=%s\u0026destination=%s\u0026mode=driving\u0026key=AIzaSyBkACm-LQkoSfsTO5_XAzBVZE9-JQzcNkg",
          "PathedURIFormat": "https://maps.googleapis.com/maps/api/staticmap?size=250x250\u0026path=%s\u0026format=jpeg\u0026maptype=roadmap\u0026key=AIzaSyBkACm-LQkoSfsTO5_XAzBVZE9-JQzcNkg\u0026size=250x250\u0026markers=%s|%s",
          "Zoom": {
@@ -69,17 +69,17 @@
          "Room": "!OYZqtInrBCn1cyz90D:m.bltrucks.top"
       }
    },
-   "Once": true,
+   "Once": false,
    "Brokers": {
       "FastExact": {
 			"RadiusMiles": 100,
          "Enabled": true,
          "Mock": true,
-         "Username": "u",
-         "Password": "p"
+         "Username": "birdman",
+         "Password": "166647"
       },
       "NTG": {
-         "Enabled": true,
+         "Enabled": false,
          "JobInfo": true,
          "Mock": true,
          "LoadPageURIFormat": "https://ntgvision.com/LoadDetails?loadId=%d",

main.go

@@ -303,7 +303,7 @@ func once() error {
 		if ok, err := sendJob(jobs[i]); err != nil {
 			return err
 		} else if ok {
-			logtr.Debugf("sent job", jobs[i])
+			logtr.Debugf("sent job %+v", jobs[i])
 			if err := db.Set(jobs[i].UID(), []byte(`sent`)); err != nil {
 				return err
 			}
@@ -352,7 +352,7 @@ func updateDeadJobs(jobs []broker.Job) error {
 		wouldBe := strings.TrimPrefix(listEntry, "sent_job_")
 		found := false
 		for i := range jobs {
-			found = found || jobs[i].ID == wouldBe
+			found = found || jobs[i].UID() == wouldBe || jobs[i].ID == wouldBe
 		}
 		logtr.Debugf("found job %s to be still alive==%v", wouldBe, found)
 		if !found {
@@ -371,14 +371,14 @@ func updateDeadJobs(jobs []broker.Job) error {
 			}
 			*/
 			if err := message.NewMatrix().Remove(recorded.MatrixID); err != nil {
-				return err
+				logtr.Debugf("failed to remove matrix: %v: %v", recorded.MatrixID, err)
 			}
 			if err := db.Set(listEntry, nil); err != nil {
-				return err
+				logtr.Debugf("failed to remove db: %v: %v", listEntry, err)
 			}
 			for _, imageid := range recorded.MatrixImageIDs {
 				if err := message.NewMatrix().Remove(imageid); err != nil {
-					return err
+					logtr.Debugf("failed to remove matrix image: %v: %v", imageid, err)
 				}
 			}
 		}
@@ -407,7 +407,7 @@ func dropBanlistJobs(jobs []broker.Job) ([]broker.Job, error) {
 func sendJob(job broker.Job) (bool, error) {
 	sender := message.NewMatrix()
 	payload := job.FormatMultilineText()
-	logtr.Debugf("once: send job %s if nonzero: %s", job.String(), payload)
+	logtr.Debugf("once: send job %s if nonzero: %q", job.String(), payload)
 	if len(payload) == 0 {
 		return false, nil
 	}
@@ -427,7 +427,7 @@ func sendJob(job broker.Job) (bool, error) {
 			logtr.Errorf("failed to marshal recorded job: %v", err)
 			return
 		}
-		if err := db.Set("sent_job_"+job.ID, b); err != nil {
+		if err := db.Set("sent_job_"+job.UID(), b); err != nil {
 			logtr.Errorf("failed to set recorded job: %v", err)
 			return
 		}

todo.yaml

@@ -1,20 +1,21 @@
 todo:
+- fast exact is dumb or...?
+- modify old items once no longer available; drop stale jobs good candidate but requires new matrix interaction
+- more than NTG; blue one
 - !states emits current state
-- TEST. Just like, refactor and test to shit.
-- try search ntg by autoinc?
 - test each !command callbacks to matrix
 - recv-as for clients so pa receives mas commands as writes
 - continuation is garbo, but I can still do better client side to avoid get-set high level
 - no hard code jpeg or have it in multiple places
 - change matrix so I test my custom logic even if I dont fetch remote
 - warn/err/etc. on clobbering ids.matrix since clients can mess with one another
-- modify old items once no longer available; drop stale jobs good candidate but requires new matrix interaction
-- more than NTG
 - todo: filter out jobs like CA
   subtasks:
   - banlist criteria like vendors, brokers, metadata
 - set up copy for caleb, broc
 done:
+- try search ntg by autoinc?
+- TEST. Just like, refactor and test to shit.
 - mark jobs no longer avail by modifying in matrix;; save matrix ID over dummy payload
 - TEST its falling apart
 - help() log on truckstop for stuff like perma 403