Updated indexer

Author: djthorpe

pkg/indexer/indexer.go

@@ -184,12 +184,12 @@ func (i *Indexer) event(ctx context.Context, evt notify.EventInfo) error {
 	case notify.Create, notify.Write:
 		info, err := os.Stat(evt.Path())
 		if err == nil && info.Mode().IsRegular() && i.ShouldVisit(relpath, info) {
-			i.queue.Add(i.name, relpath)
+			i.queue.Add(i.name, relpath, info)
 		}
 	case notify.Remove, notify.Rename:
 		info, err := os.Stat(evt.Path())
 		if err == nil && info.Mode().IsRegular() && i.ShouldVisit(relpath, info) {
-			i.queue.Add(i.name, relpath)
+			i.queue.Add(i.name, relpath, info)
 		} else {
 			// Always attempt removal from index
 			i.queue.Remove(i.name, relpath)
@@ -202,7 +202,7 @@ func (i *Indexer) event(ctx context.Context, evt notify.EventInfo) error {
 // visit is used to index a file from the indexer
 func (i *Indexer) visit(ctx context.Context, abspath, relpath string, info fs.FileInfo) error {
 	if info.Mode().IsRegular() {
-		i.queue.Add(i.name, relpath)
+		i.queue.Add(i.name, relpath, info)
 	}
 	return nil
 }

pkg/indexer/queue.go

@@ -2,6 +2,7 @@ package indexer
 
 import (
 	"fmt"
+	"io/fs"
 	"path/filepath"
 	"sync"
 	// Package imports
@@ -22,6 +23,7 @@ type QueueEvent struct {
 	Event
 	Name string
 	Path string
+	Info fs.FileInfo
 }
 
 type Event uint
@@ -80,14 +82,14 @@ func (this *Queue) String() string {
 
 // Add an item to the queue. If the item is already in the queue,
 // then it is bumped to the end of the queue
-func (q *Queue) Add(name, path string) {
+func (q *Queue) Add(name, path string, info fs.FileInfo) {
 	if elem := q.Get(name, path); elem != nil {
 		// Remove the element from the existing queue
 		q.del(name, path)
 	}
 
 	// Add the element to the queue
-	q.add(EventAdd, name, path)
+	q.add(EventAdd, name, path, info)
 }
 
 // Remove an item to the queue. If the item is already in the queue,
@@ -99,7 +101,7 @@ func (q *Queue) Remove(name, path string) {
 	}
 
 	// Add the element to the queue
-	q.add(EventRemove, name, path)
+	q.add(EventRemove, name, path, nil)
 }
 
 // Return a queue event from the queue, or nil
@@ -141,7 +143,7 @@ func (q *Queue) Count() int {
 ///////////////////////////////////////////////////////////////////////////////
 // PRIVATE METHODS
 
-func (q *Queue) add(e Event, name, path string) {
+func (q *Queue) add(e Event, name, path string, info fs.FileInfo) {
 	q.RWMutex.Lock()
 	defer q.RWMutex.Unlock()
 	// This assumes the key does not exist
@@ -150,7 +152,7 @@ func (q *Queue) add(e Event, name, path string) {
 		panic("Queue: key already exists")
 	}
 	q.q = append(q.q, key)
-	q.k[key] = &QueueEvent{e, name, path}
+	q.k[key] = &QueueEvent{e, name, path, info}
 }
 
 func (q *Queue) del(name, path string) {

pkg/indexer/schema.go

@@ -3,6 +3,7 @@ package indexer
 import (
 	"context"
 	"errors"
+	"path/filepath"
 
 	// Namespace imports
 	. "github.com/mutablelogic/go-sqlite"
@@ -31,6 +32,12 @@ func CreateSchema(ctx context.Context, pool SQPool, schema string) error {
 		if _, err := txn.Query(N(filesTableName).WithSchema(schema).CreateTable(
 			C("name").WithPrimary(),
 			C("path").WithPrimary(),
+			C("parent"),
+			C("filename").NotNull(),
+			C("isdir").WithType("INTEGER").NotNull(),
+			C("ext"),
+			C("modtime"),
+			C("size").WithType("INTEGER"),
 		).IfNotExists()); err != nil {
 			return err
 		}
@@ -39,8 +46,17 @@ func CreateSchema(ctx context.Context, pool SQPool, schema string) error {
 }
 
 func Replace(schema string, evt *QueueEvent) (SQStatement, []interface{}) {
-	return N(filesTableName).WithSchema(schema).Replace("name", "path"),
-		[]interface{}{evt.Name, evt.Path}
+	return N(filesTableName).WithSchema(schema).Replace("name", "path", "parent", "filename", "isdir", "ext", "modtime", "size"),
+		[]interface{}{
+			evt.Name,
+			evt.Path,
+			filepath.Dir(evt.Path),
+			evt.Info.Name(),
+			boolToInt64(evt.Info.IsDir()),
+			filepath.Ext(evt.Info.Name()),
+			evt.Info.ModTime(),
+			evt.Info.Size(),
+		}
 }
 
 func Delete(schema string, evt *QueueEvent) (SQStatement, []interface{}) {

pkg/indexer/util.go

@@ -8,3 +8,10 @@ func stringSliceContains(slice []string, s string) bool {
 	}
 	return false
 }
+
+func boolToInt64(v bool) int64 {
+	if v {
+		return 1
+	}
+	return 0
+}