scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-09-27 01:21:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix skipItemUpdate logic in Item#relinkAttachmentFile()

Browse source 
We were skipping updating of `clientDateModified` in order to prevent an
attachment item upload, but that hasn't been used since Zotero 4. This
might mean that, in some rare situations (e.g., a filename that needed to
be shortened due to filesystem path length?), people in read-only or
non-files-editable groups may have ended up triggering access errors and
needing to reset local data after a file download.

Now, we properly skip marking the attachment item as unsynced.
This commit is contained in:
Dan Stillman 2025-08-27 03:16:27 -04:00
parent f5010ce764
commit b857283ed6
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
chrome/content/zotero/xpcom/data/item.js
View file

@ -2939,10 +2939,8 @@ Zotero.Item.prototype.renameAttachmentFile = async function (newName, overwrite
/**
* @param {string} path File path
* @param {Boolean} [skipItemUpdate] Don't update attachment item mod time, so that item doesn't
* sync. Used when a file needs to be renamed to be accessible but the user doesn't have
* access to modify the attachment metadata. This also allows a save when the library is
* read-only.
* @param {Boolean} [skipItemUpdate] Don't mark item as unsynced. Used when a file needs to be
* renamed to be accessible but the user doesn't have access to modify the attachment metadata.
*/
Zotero.Item.prototype.relinkAttachmentFile = async function (path, skipItemUpdate) {
if (path instanceof Components.interfaces.nsIFile) {
@ -3028,7 +3026,7 @@ Zotero.Item.prototype.relinkAttachmentFile = async function (path, skipItemUpdat
await this.saveTx({
skipDateModifiedUpdate: true,
skipClientDateModifiedUpdate: skipItemUpdate,
skipSyncedUpdate: skipItemUpdate,
skipEditCheck: skipItemUpdate
});

9
chrome/content/zotero/xpcom/storage/storageLocal.js
View file

@ -598,16 +598,15 @@ Zotero.Sync.Storage.Local = {
}
// If newPath is set, the file was renamed, so set item filename to that
// and mark for updated
// and mark item for upload
var path = await item.getFilePathAsync();
if (newPath && path != newPath) {
// If library isn't editable but filename was changed, update
// database without updating the item's mod time, which would result
// in a library access error
// If library isn't editable but filename was changed, update database without marking
// item as unsynced
try {
if (!Zotero.Items.isEditable(item)) {
Zotero.debug("File renamed without library access -- "
+ "updating itemAttachments path", 3);
+ "updating attachment path", 3);
await item.relinkAttachmentFile(newPath, true);
}
else {