Move top level package to internal (#5)

Author: efixler

cmd/scrape/main.go

@@ -19,10 +19,10 @@ import (
 	"os"
 
 	"github.com/efixler/envflags"
-	"github.com/efixler/scrape"
 	"github.com/efixler/scrape/database"
 	"github.com/efixler/scrape/fetch"
 	"github.com/efixler/scrape/fetch/trafilatura"
+	"github.com/efixler/scrape/internal"
 	"github.com/efixler/scrape/internal/cmd"
 	"github.com/efixler/scrape/internal/headless"
 	"github.com/efixler/scrape/internal/storage"
@@ -171,7 +171,7 @@ func openDatabase(dbh *database.DBHandle, ctx context.Context) {
 	}
 }
 
-func initFetcher(dbh *database.DBHandle) (*scrape.StorageBackedFetcher, error) {
+func initFetcher(dbh *database.DBHandle) (*internal.StorageBackedFetcher, error) {
 	var err error
 	var client fetch.Client
 	if headlessEnabled {
@@ -185,7 +185,7 @@ func initFetcher(dbh *database.DBHandle) (*scrape.StorageBackedFetcher, error) {
 			fetch.WithUserAgent(userAgent.Get().String()),
 		)
 	}
-	fetcher, err := scrape.NewStorageBackedFetcher(
+	fetcher, err := internal.NewStorageBackedFetcher(
 		trafilatura.MustNew(client),
 		storage.NewURLDataStore(dbh),
 	)

benchmark_test.go renamed to internal/benchmark_test.go

@@ -1,6 +1,6 @@
 //go:build benchmark
 
-package scrape
+package internal
 
 // This file is associated with the tag "benchmark" to keep it from running
 // during normal tests.  It can take a while, and some of the tests call out,

scrape.go renamed to internal/scrape.go

@@ -3,7 +3,7 @@ Package scrape provides a simple interface for fetching and storing web pages'
 metadata and text content. The `scrape` and `scrape-server` commands provide
 a command-line interface and a REST API, respectively.
 */
-package scrape
+package internal
 
 import (
 	"context"

scrape_test.go renamed to internal/scrape_test.go

@@ -1,4 +1,4 @@
-package scrape
+package internal
 
 import (
 	"context"

internal/server/routes.go

@@ -16,10 +16,10 @@ import (
 
 	"github.com/efixler/webutil/jsonarray"
 
-	"github.com/efixler/scrape"
 	"github.com/efixler/scrape/database"
 	"github.com/efixler/scrape/fetch"
 	"github.com/efixler/scrape/fetch/feed"
+	"github.com/efixler/scrape/internal"
 	"github.com/efixler/scrape/internal/auth"
 	"github.com/efixler/scrape/internal/server/healthchecks"
 	"github.com/efixler/scrape/internal/storage"
@@ -67,7 +67,7 @@ func NewScrapeServer(
 	directFetcher fetch.URLFetcher,
 	headlessFetcher fetch.URLFetcher,
 ) (*scrapeServer, error) {
-	urlFetcher, err := scrape.NewStorageBackedFetcher(
+	urlFetcher, err := internal.NewStorageBackedFetcher(
 		directFetcher,
 		storage.NewURLDataStore(dbh),
 	)
@@ -283,7 +283,7 @@ func (ss *scrapeServer) delete(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "Can't process delete request, no input data", http.StatusInternalServerError)
 		return
 	}
-	deleter, ok := ss.urlFetcher.(*scrape.StorageBackedFetcher)
+	deleter, ok := ss.urlFetcher.(*internal.StorageBackedFetcher)
 	if !ok {
 		http.Error(w, "Can't delete in the current configuration", http.StatusNotImplemented)
 		return

internal/server/templates/index.html

@@ -90,7 +90,6 @@
 	name="data-iframe"
 	class="data-iframe"
 	>
-
 </div>
 </body>
 </html>