Skip to content

[stable25] Fix renaming faces: Do not delete existing face when renaming #1581

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

Merged
marcelklehr merged 2 commits into from
Feb 7, 2023
Merged

[stable25] Fix renaming faces: Do not delete existing face when renaming #1581

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1891a61
Fix renaming faces: Do not delete existing face when renaming
marcelklehr Jan 7, 2023
9595b78
Compile assets
nextcloud-command Feb 7, 2023
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
Next Next commit
Fix renaming faces: Do not delete existing face when renaming 
fixes nextcloud/recognize#408

Signed-off-by: Marcel Klehr <[email protected]>
  • Loading branch information
@marcelklehr
marcelklehr committed Feb 7, 2023
commit 1891a610a83133e42e5af8b95774ee740eee9834
7 changes: 5 additions & 2 deletions src/store/faces.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,17 +195,20 @@ const actions = {
let face = state.faces[oldName]

try {
if (state.faces[faceName]) {
throw new Error('Name already exists')
}
await client.moveFile(
`/recognize/${getCurrentUser()?.uid}/faces/${oldName}`,
`/recognize/${getCurrentUser()?.uid}/faces/${faceName}`,
)
context.commit('removeFaces', { faceNames: [oldName] })
face = { ...face, basename: faceName }
context.commit('addFaces', { faces: [face] })
} catch (error) {
logger.error(t('photos', 'Failed to rename {oldName} to {faceName}.', { oldName, faceName }), { error })
showError(t('photos', 'Failed to rename {oldName} to {faceName}.', { oldName, faceName }))
} finally {
context.commit('addFaces', { faces: [face] })
throw error
}
},

Expand Down