Skip to content

[BR-2060]: fix/newobject single lookup #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jzunigax2 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[BR-2060]: fix/newobject single lookup #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14cc32a
docs: add note about using config/update to reconnect an oauth remote
FTCHD May 13, 2026
7a8b584
refactor: streamline file existence checks and metadata retrieval
jzunigax2 May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
164 changes: 63 additions & 101 deletions backend/internxt/internxt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,46 +538,52 @@ func (f *Fs) CreateDir(ctx context.Context, pathID, leaf string) (string, error)
return resp.UUID, nil
}

// preUploadCheck checks if a file exists in the given directory
// Returns the file metadata if it exists, nil if not
func (f *Fs) preUploadCheck(ctx context.Context, leaf, directoryID string) (*folders.File, error) {
// Parse name and extension from the leaf
baseName := f.opt.Encoding.FromStandardName(leaf)
name := strings.TrimSuffix(baseName, path.Ext(baseName))
ext := strings.TrimPrefix(path.Ext(baseName), ".")

checkResult, err := files.CheckFilesExistence(ctx, f.cfg, directoryID, []files.FileExistenceCheck{
{
// splitNameExt splits a basename into the (name, ext) shape
func splitNameExt(baseName string) (name, ext string) {
name = strings.TrimSuffix(baseName, path.Ext(baseName))
ext = strings.TrimPrefix(path.Ext(baseName), ".")
return
}

// findFile looks up a single file by name within directoryID. Returns
// (nil, nil) when the file does not exist; surfaces transport/API errors.
func (f *Fs) findFile(ctx context.Context, leaf, directoryID string) (*folders.File, error) {
name, ext := splitNameExt(f.opt.Encoding.FromStandardName(leaf))

var checkResult *files.CheckFilesExistenceResponse
err := f.pacer.Call(func() (bool, error) {
var err error
checkResult, err = files.CheckFilesExistence(ctx, f.cfg, directoryID, []files.FileExistenceCheck{{
PlainName: name,
Type: ext,
OriginalFile: struct{}{},
},
}})
return f.shouldRetry(ctx, err)
})

if err != nil {
// If existence check fails, assume file doesn't exist to allow upload to proceed
return nil, err
}
if len(checkResult.Files) == 0 || !checkResult.Files[0].FileExists() {
return nil, nil
}
result := checkResult.Files[0]
if result.Type != ext || result.UUID == "" {
return nil, nil
}

if len(checkResult.Files) > 0 && checkResult.Files[0].FileExists() {
result := checkResult.Files[0]
if result.Type != ext {
return nil, nil
}

existingUUID := result.UUID
if existingUUID != "" {
fileMeta, err := files.GetFileMeta(ctx, f.cfg, existingUUID)
if err == nil && fileMeta != nil {
return convertFileMetaToFile(fileMeta), nil
}

if err != nil {
return nil, err
}
}
var fileMeta *files.FileMeta
err = f.pacer.Call(func() (bool, error) {
var err error
fileMeta, err = files.GetFileMeta(ctx, f.cfg, result.UUID)
return f.shouldRetry(ctx, err)
})
if err != nil {
return nil, err
}
if fileMeta == nil {
return nil, nil
}
return nil, nil
return convertFileMetaToFile(fileMeta), nil
}

// convertFileMetaToFile converts files.FileMeta to folders.File
Expand Down Expand Up @@ -656,11 +662,8 @@ func (f *Fs) Put(ctx context.Context, in io.Reader, src fs.ObjectInfo, options .
return nil, err
}

// Check if file already exists
existingFile, err := f.preUploadCheck(ctx, leaf, directoryID)
if err != nil {
return nil, err
}
// Best-effort existence check
existingFile, _ := f.findFile(ctx, leaf, directoryID)

// Create object - if file exists, populate it with existing metadata
o := &Object{
Expand Down Expand Up @@ -709,40 +712,23 @@ func (f *Fs) Remove(ctx context.Context, remote string) error {
return nil
}

// NewObject creates a new object
// NewObject creates a new object by looking up a single file's metadata.
func (f *Fs) NewObject(ctx context.Context, remote string) (fs.Object, error) {
parentDir := path.Dir(remote)

if parentDir == "." {
parentDir = ""
}

dirID, err := f.dirCache.FindDir(ctx, parentDir, false)
leaf, directoryID, err := f.dirCache.FindPath(ctx, remote, false)
if err != nil {
return nil, fs.ErrorObjectNotFound
if err == fs.ErrorDirNotFound {
return nil, fs.ErrorObjectNotFound
}
return nil, err
}

var files []folders.File
err = f.pacer.Call(func() (bool, error) {
var err error
files, err = folders.ListAllFiles(ctx, f.cfg, dirID)
return f.shouldRetry(ctx, err)
})
file, err := f.findFile(ctx, leaf, directoryID)
if err != nil {
return nil, err
}
targetName := path.Base(remote)
for _, e := range files {
name := e.PlainName
if len(e.Type) > 0 {
name += "." + e.Type
}
decodedName := f.opt.Encoding.ToStandardName(name)
if decodedName == targetName {
return newObjectWithFile(f, remote, &e), nil
}
if file == nil {
return nil, fs.ErrorObjectNotFound
}
return nil, fs.ErrorObjectNotFound
return newObjectWithFile(f, remote, file), nil
}

// newObjectWithFile returns a new object by file info
Expand Down Expand Up @@ -872,9 +858,7 @@ func (o *Object) Open(ctx context.Context, options ...fs.OpenOption) (io.ReadClo
func (o *Object) Update(ctx context.Context, in io.Reader, src fs.ObjectInfo, options ...fs.OpenOption) error {
remote := o.remote

origBaseName := path.Base(remote)
origName := strings.TrimSuffix(origBaseName, path.Ext(origBaseName))
origType := strings.TrimPrefix(path.Ext(origBaseName), ".")
origName, origType := splitNameExt(path.Base(remote))

// Create directory if it doesn't exist
_, dirID, err := o.f.dirCache.FindPath(ctx, remote, true)
Expand All @@ -891,11 +875,7 @@ func (o *Object) Update(ctx context.Context, in io.Reader, src fs.ObjectInfo, op

// Step 1: If file exists, rename to backup (preserves old file during upload)
if oldUUID != "" {
// Generate unique backup name
baseName := path.Base(remote)
name := strings.TrimSuffix(baseName, path.Ext(baseName))
ext := strings.TrimPrefix(path.Ext(baseName), ".")

name, ext := splitNameExt(path.Base(remote))
backupSuffix := fmt.Sprintf(".rclone-backup-%s", random.String(8))
backupName = o.f.opt.Encoding.FromStandardName(name + backupSuffix)
backupType = ext
Expand Down Expand Up @@ -1038,40 +1018,22 @@ func (o *Object) recoverFromTimeoutConflict(ctx context.Context, uploadErr error
}

baseName := path.Base(remote)
encodedName := o.f.opt.Encoding.FromStandardName(baseName)

var meta *buckets.CreateMetaResponse
checkErr := o.f.pacer.Call(func() (bool, error) {
existingFile, err := o.f.preUploadCheck(ctx, encodedName, dirID)
if err != nil {
return o.f.shouldRetry(ctx, err)
}
if existingFile != nil {
name := strings.TrimSuffix(baseName, path.Ext(baseName))
ext := strings.TrimPrefix(path.Ext(baseName), ".")

meta = &buckets.CreateMetaResponse{
UUID: existingFile.UUID,
FileID: existingFile.FileID,
Name: name,
PlainName: name,
Type: ext,
Size: existingFile.Size,
}
o.id = existingFile.FileID
}
return false, nil
})

if checkErr != nil {
existingFile, err := o.f.findFile(ctx, baseName, dirID)
if err != nil || existingFile == nil {
return nil, uploadErr
}

if meta != nil {
return meta, nil
}

return nil, uploadErr
name, ext := splitNameExt(baseName)
o.id = existingFile.FileID
return &buckets.CreateMetaResponse{
UUID: existingFile.UUID,
FileID: existingFile.FileID,
Name: name,
PlainName: name,
Type: ext,
Size: existingFile.Size,
}, nil
}

// restoreBackupFile restores a backup file after upload failure
Expand Down
7 changes: 7 additions & 0 deletions docs/content/rc.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,6 +815,13 @@ This takes the following parameters:

See the [config update](/commands/rclone_config_update/) command for more information on the above.

**Reconnecting a remote:** Calling `config/update` with empty
`parameters` runs the post-config / authorize flow, equivalent to
`rclone config reconnect`. This can be used to re-authenticate a
remote (e.g. refresh an OAuth token):

rclone rc config/update name=myremote parameters={} opt={"nonInteractive": true}

### core/bwlimit: Set the bandwidth limit. {#core-bwlimit}

This sets the bandwidth limit to the string passed in. This should be
Expand Down