Change counter store to xdg data dir

This commit is contained in:
2025-07-21 10:28:39 +03:00
parent 6d9e14c262
commit 87188deda5
3 changed files with 27 additions and 10 deletions

5
go.mod
View File

@@ -4,4 +4,7 @@ go 1.24.3
require github.com/fsnotify/fsnotify v1.9.0
require golang.org/x/sys v0.13.0 // indirect
require (
github.com/adrg/xdg v0.5.3
golang.org/x/sys v0.26.0 // indirect
)

14
go.sum
View File

@@ -1,4 +1,14 @@
github.com/adrg/xdg v0.5.3 h1:xRnxJXne7+oWDatRhR1JLnvuccuIeCoBu2rtuLqQB78=
github.com/adrg/xdg v0.5.3/go.mod h1:nlTsY+NNiCBGCK2tpm09vRqfVzrc2fLmXGpBLF0zlTQ=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

18
main.go
View File

@@ -12,6 +12,7 @@ import (
"syscall"
"time"
"github.com/adrg/xdg"
"github.com/fsnotify/fsnotify"
)
@@ -22,6 +23,11 @@ func main() {
destDir := "/home/av/temp/dest"
os.MkdirAll(destDir, 0755)
counterFile, err := xdg.DataFile("filemover/counter")
if err != nil {
log.Fatalf("Application data dir not accessible, %v", err)
}
// Контекст для graceful shutdown
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
@@ -36,20 +42,20 @@ func main() {
// Запуск единственного обработчика
go func() {
defer wg.Done()
counter := loadCounter(destDir)
counter := loadCounter(counterFile)
for {
select {
case file, ok := <-tasks:
if !ok {
// Канал закрыт, завершаем работу
saveCounter(destDir, counter)
saveCounter(counterFile, counter)
log.Println("Worker stopped")
return
}
processFile(file, destDir, &counter)
case <-ctx.Done():
// Получен сигнал завершения
saveCounter(destDir, counter)
saveCounter(counterFile, counter)
log.Println("Worker stopped by context")
return
}
@@ -145,8 +151,7 @@ func processFile(filePath, destDir string, counter *int) {
log.Printf("Moved: %s -> %s", filePath, destPath)
}
func loadCounter(dir string) int {
counterPath := filepath.Join(dir, "counter.txt")
func loadCounter(counterPath string) int {
data, err := os.ReadFile(counterPath)
if err != nil {
if !os.IsNotExist(err) {
@@ -162,8 +167,7 @@ func loadCounter(dir string) int {
return count
}
func saveCounter(dir string, count int) {
counterPath := filepath.Join(dir, "counter.txt")
func saveCounter(counterPath string, count int) {
if err := os.WriteFile(counterPath, []byte(strconv.Itoa(count)), 0644); err != nil {
log.Printf("Failed to save counter: %v", err)
}