refactor: juggle some stuff around

.gitignore

···
 bin/
-db/

Makefile

···
 all: bin/mostliked bin/feedweb
 
-bin/mostliked: cmd/mostliked/*.go pkg/mostliked/*.go
+bin/mostliked: cmd/mostliked/*.go pkg/mostliked/*.go db/mostliked/*.go
 	go build -o $@ ./cmd/mostliked
 
-bin/feedweb: cmd/feedweb/*.go pkg/*/*.go mostliked/*.go
+bin/feedweb: cmd/feedweb/*.go pkg/*/*.go db/*/*.go
 	go build -o $@ ./cmd/feedweb
+
+.PHONY: clean
+clean:
+	rm bin/*

cmd/feedweb/feedweb.go cmd/feedweb/main.go

···
 import (
 	"net/http"
 
-	"github.com/edavis/bsky-feeds/mostliked"
+	"github.com/edavis/bsky-feeds/pkg/mostliked"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 )

cmd/mostliked/main.go

···
+package main
+
+import (
+	"log"
+
+	"github.com/gorilla/websocket"
+
+	"github.com/edavis/bsky-feeds/pkg/mostliked"
+)
+
+func main() {
+	conn, _, err := websocket.DefaultDialer.Dial("ws://localhost:6008/subscribe?wantedCollections=app.bsky.feed.post&wantedCollections=app.bsky.feed.like", nil)
+	if err != nil {
+		log.Fatal("websocket connection error:", err)
+	}
+	defer conn.Close()
+
+	jetstreamEvents := make(chan []byte)
+	go mostliked.Handler(jetstreamEvents)
+
+	log.Println("starting up")
+	for {
+		_, message, err := conn.ReadMessage()
+		if err != nil {
+			log.Println("error reading from websocket:", err)
+			break
+		}
+		jetstreamEvents <- message
+	}
+}

cmd/mostliked/mostliked.go pkg/mostliked/handler.go

···
-package main
+package mostliked
 
 import (
 	"context"
···
 
 	appbsky "github.com/bluesky-social/indigo/api/bsky"
 	jetstream "github.com/bluesky-social/jetstream/pkg/models"
-	db "github.com/edavis/bsky-feeds/pkg/mostliked"
-	"github.com/gorilla/websocket"
+	db "github.com/edavis/bsky-feeds/db/mostliked"
 	"github.com/karlseguin/ccache/v3"
 	_ "github.com/mattn/go-sqlite3"
 	"github.com/pemistahl/lingua-go"
···
 	return ""
 }
 
-func processEvents(events <-chan []byte) {
+func Handler(events <-chan []byte) {
 	ctx := context.Background()
 
-	dbCnx, err := sql.Open("sqlite3", "db/mostliked.db?_journal=WAL&_fk=on")
+	dbCnx, err := sql.Open("sqlite3", "data/mostliked.db?_journal=WAL&_fk=on")
 	if err != nil {
 		log.Fatal("error opening db")
 	}
···
 		}
 	}
 }
-
-func main() {
-	conn, _, err := websocket.DefaultDialer.Dial("ws://localhost:6008/subscribe?wantedCollections=app.bsky.feed.post&wantedCollections=app.bsky.feed.like", nil)
-	if err != nil {
-		log.Fatal("websocket connection error:", err)
-	}
-	defer conn.Close()
-
-	jetstreamEvents := make(chan []byte)
-	go processEvents(jetstreamEvents)
-
-	log.Println("starting up")
-	for {
-		_, message, err := conn.ReadMessage()
-		if err != nil {
-			log.Println("error reading from websocket:", err)
-			break
-		}
-		jetstreamEvents <- message
-	}
-}

mostliked/feed.go pkg/mostliked/view.go

···
 	"log"
 	"strconv"
 
-	db "github.com/edavis/bsky-feeds/pkg/mostliked"
+	db "github.com/edavis/bsky-feeds/db/mostliked"
 	_ "github.com/mattn/go-sqlite3"
 )
 
···
 
 func Feed(args FeedViewParams) []string {
 	ctx := context.Background()
-	dbCnx, err := sql.Open("sqlite3", "db/mostliked.db?_journal=WAL&_fk=on")
+	dbCnx, err := sql.Open("sqlite3", "data/mostliked.db?_journal=WAL&_fk=on")
 	if err != nil {
 		log.Fatal("error opening db")
 	}

sqlc.yaml

···
 version: "2"
 sql:
   - engine: "sqlite"
-    queries: "cmd/mostliked/query.sql"
-    schema: "cmd/mostliked/schema.sql"
+    queries: "pkg/mostliked/query.sql"
+    schema: "pkg/mostliked/schema.sql"
     gen:
       go:
         package: "mostliked"
-        out: "pkg/mostliked"
+        out: "db/mostliked"