Yandex Disk: change file name generation logic to implement files automatic deletion

Author: nil2x

go.mod

@@ -6,8 +6,6 @@ require github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
 
 require golang.org/x/time v0.15.0
 
-require github.com/google/uuid v1.6.0
-
 require (
 	github.com/emersion/go-imap/v2 v2.0.0-beta.8
 	github.com/emersion/go-message v0.18.2 // indirect

go.sum

@@ -4,8 +4,6 @@ github.com/emersion/go-message v0.18.2 h1:rl55SQdjd9oJcIoQNhubD2Acs1E6IzlZISRTK7
 github.com/emersion/go-message v0.18.2/go.mod h1:XpJyL70LwRvq2a8rVbHXikPgKj8+aI0kGdHlg16ibYA=
 github.com/emersion/go-sasl v0.0.0-20241020182733-b788ff22d5a6 h1:oP4q0fw+fOSWn3DfFi4EXdT+B+gTtzx8GC9xsc26Znk=
 github.com/emersion/go-sasl v0.0.0-20241020182733-b788ff22d5a6/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=

internal/handler/listener.go

@@ -302,8 +302,11 @@ func ListenYaDisk(ctx context.Context, cfg config.Config, vkC *api.VKClient, sto
 					b, err := yadiskC.Download(item.Name)
 
 					if err == nil {
+						s := string(b)
+						yadiskC.UpdateNamespace(s)
+
 						dataMu.Lock()
-						data = append(data, string(b))
+						data = append(data, s)
 						dataMu.Unlock()
 					} else {
 						slog.Error("yadisk: listen", "name", yadiskC.Name, "err", err)

internal/yadisk/client.go

@@ -12,15 +12,16 @@ import (
 	"path"
 	"time"
 
-	"github.com/google/uuid"
+	"github.com/nil2x/cheburnet/internal/api"
 	"github.com/nil2x/cheburnet/internal/config"
 )
 
 // Client is a client for interaction with Yandex Disk.
 type Client struct {
-	Name   string
-	cfgAPI config.API
-	cfgYa  config.YaDisk
+	Name     string
+	cfgAPI   config.API
+	cfgYa    config.YaDisk
+	storageC *api.StorageClient
 }
 
 // New returns new Client for the given config.
@@ -34,9 +35,10 @@ func New(cfgAPI config.API, cfgYa config.YaDisk) *Client {
 	}
 
 	c := &Client{
-		Name:   cfgYa.Name,
-		cfgAPI: cfgAPI,
-		cfgYa:  cfgYa,
+		Name:     cfgYa.Name,
+		cfgAPI:   cfgAPI,
+		cfgYa:    cfgYa,
+		storageC: api.NewStorageClient(),
 	}
 
 	return c
@@ -102,11 +104,18 @@ func (r hrefResp) check() error {
 
 // Upload uploads data in the root directory and returns name of a created file.
 //
+// The name is generated according to the internal logic. For it to work correctly
+// call UpdateNamespace. The name is not unique, do not use it as a constant key.
+//
+// The file is not constant and will be overwritten with future Upload calls.
+// File lifetime depends on Upload frequency, not expect it to be more than few minutes.
+// When file is overwritten, its creation time also changes.
+//
 // ext specifies file extension. Optional. Example: "txt".
 //
 // See https://yandex.ru/dev/disk-api/doc/ru/reference/upload
 func (c *Client) Upload(b []byte, ext string) (string, error) {
-	name := uuid.NewString()
+	name := c.storageC.CreateSetKey()
 
 	if ext != "" {
 		name += "." + ext
@@ -116,7 +125,7 @@ func (c *Client) Upload(b []byte, ext string) (string, error) {
 
 	values := url.Values{}
 	values.Set("path", path)
-	values.Set("overwrite", "false")
+	values.Set("overwrite", "true")
 
 	query := values.Encode()
 	url := fmt.Sprintf("%v/v1/disk/resources/upload?%v", c.cfgYa.Origin, query)
@@ -256,3 +265,9 @@ func (c *Client) Items(limit int) (ItemsResp, error) {
 
 	return resp, nil
 }
+
+// UpdateNamespace should be called for every Datagram value you receive from Download.
+// It is necessary for Upload to generate correct names.
+func (c *Client) UpdateNamespace(value string) {
+	c.storageC.UpdateNamespace(value)
+}