add: [filerwatcher] wip

master
Jean-Louis Huynen 2021-02-17 15:05:17 +01:00
parent fbb4abac22
commit cdc6b5da52
No known key found for this signature in database
GPG Key ID: 64799157F4BD6B93
1 changed files with 63 additions and 29 deletions

View File

@ -5,7 +5,6 @@ import (
"encoding/base64"
"github.com/rjeczalik/notify"
"io"
"io/ioutil"
"log"
"os"
)
@ -20,9 +19,13 @@ type FileWatcherReader struct {
// TearDown channel
exit chan string
// Current buffer
buf []byte
// json
json bool
// Current file
curfile *os.File
// Current state Watching / Reading
watching bool
// Insert Separator
insertsep bool
}
// NewFileWatcherReader creates a new FileWatcherReader
@ -30,8 +33,10 @@ type FileWatcherReader struct {
func NewFileWatcherReader(f *os.File, j bool) (*FileWatcherReader, error) {
r := &FileWatcherReader{
folderfd: f,
eic: make(chan notify.EventInfo, 1),
eic: make(chan notify.EventInfo, 4096),
json: j,
watching: true,
insertsep: false,
}
// go routine holding the watcher
go func() {
@ -47,35 +52,22 @@ func NewFileWatcherReader(f *os.File, j bool) (*FileWatcherReader, error) {
// Read waits for InCloseWrite file event uses a bytes reader to copy
// the resulting file encoded in b64 in p
func (fw *FileWatcherReader) Read(p []byte) (n int, err error) {
// Watching for new files to read
if fw.watching {
watchloop:
for {
select {
case ei := <-fw.eic:
log.Println("Got event:", ei)
//log.Println("Got event:", ei)
// New File, let's read its content
var err error
fw.buf, err = ioutil.ReadFile(ei.Path())
fw.curfile, err = os.Open(ei.Path())
if err != nil {
log.Fatal(err)
}
// if not json it could be anything so we encode it in b64
if !fw.json{
// base64 stream encoder
b64buf := new(bytes.Buffer)
b64encoder := base64.NewEncoder(base64.StdEncoding, b64buf)
// Encode in Base64 to b64buf
b64encoder.Write(fw.buf)
// Close the encoder to flush partially written blocks
b64encoder.Close()
b64buf.WriteString("\n")
//rreader := bytes.NewReader(fw.buf)
n, err = b64buf.Read(p)
}else{
fw.buf = append(fw.buf, "\n"...)
rreader := bytes.NewReader(fw.buf)
n, err = rreader.Read(p)
return n, err
}
return n, err
fw.watching = false
break watchloop
case <-fw.exit:
// Exiting
return 0, io.EOF
@ -83,6 +75,48 @@ func (fw *FileWatcherReader) Read(p []byte) (n int, err error) {
}
}
// Inserting separator
if fw.insertsep{
var buf []byte
buf = append(buf, "\n"...)
rreader := bytes.NewReader(buf)
n, err = rreader.Read(p)
fw.watching = true
fw.insertsep = false
log.Println("Inserting file seperator ")
fw.curfile.Close()
return n, err
}
// Reading
// if not json it could be anything so we encode it in b64
if !fw.json {
// base64 stream encoder
b64buffer := new(bytes.Buffer)
b64encoder := base64.NewEncoder(base64.StdEncoding, b64buffer)
// Read the file using p's length to get he correct size automatically
buf := make([]byte, len(p))
n, err = fw.curfile.Read(buf)
// buf is the input
b64encoder.Write(buf)
// Close the encoder to flush partially written blocks
b64encoder.Close()
if err == io.EOF {
fw.insertsep = true
}
// Copy from b64buffer to p
n, err = b64buffer.Read(p)
// I keep a len(p) buffer size as python knows how to handle the padding
} else {
n, err = fw.curfile.Read(p)
if err == io.EOF {
fw.insertsep = true
}
}
//log.Println("nread: ", n)
return n, err
}
// Teardown is called on error to stop the Reading loop if needed
func (rl *FileWatcherReader) Teardown() {
rl.exit <- "exit"