mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Mark locally missing files marked for upload for download instead

Browse source 
Z7 removed an `OS.File.open()` in `_checkForUpdatedFiles()` that would
throw on missing files and cause them to be marked for download in a
`catch`.

This likely caused the fix for #1753 not to work in Z7.
This commit is contained in:
Dan Stillman 2025-04-14 04:12:06 -04:00
parent 76b8556c16
commit ec59f43a68
2 changed files with 36 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -330,21 +330,21 @@ Zotero.Sync.Storage.Local = {
var fileName = PathUtils.filename(path);
try {
// If file is already marked for upload, skip check. Even if the file was changed
// both locally and remotely, conflicts are checked at upload time, so we don't need
// to worry about it here.
//
// This is after open() so that a missing file is properly marked for download.
if (item.attachmentSyncState == this.SYNC_STATE_TO_UPLOAD) {
Zotero.debug("File is already marked for upload");
return false;
}
let { lastModified: fmtime } = yield IOUtils.stat(path);
//Zotero.debug("Memory usage: " + memmgr.resident);
//Zotero.debug("File modification time for item " + lk + " is " + fmtime);
// If file is already marked for upload, skip check. Even if the file was changed
// both locally and remotely, conflicts are checked at upload time, so we don't need
// to worry about it here.
//
// This is after stat() so that a missing file is properly marked for download.
if (item.attachmentSyncState == this.SYNC_STATE_TO_UPLOAD) {
Zotero.debug("File is already marked for upload");
return false;
}
if (fmtime < 0) {
Zotero.debug("File mod time " + fmtime + " is less than 0 -- interpreting as 0", 2);
fmtime = 0;

27
test/tests/storageLocalTest.js
View file

@ -90,7 +90,32 @@ describe("Zotero.Sync.Storage.Local", function () {
assert.isFalse(changed);
assert.equal(syncState, Zotero.Sync.Storage.Local.SYNC_STATE_IN_SYNC);
assert.equal(syncedModTime, newModTime);
})
});
it("should flag a missing local file for download if already marked for upload", async function () {
// Create attachment
let item = await importFileAttachment('test.png');
var hash = await item.attachmentHash;
var mtime = await item.attachmentModificationTime;
// Mark as synced, so it will be checked
item.attachmentSyncedModificationTime = mtime;
item.attachmentSyncedHash = hash;
item.attachmentSyncState = "to_upload";
await item.saveTx({ skipAll: true });
// Delete local file
await IOUtils.remove(item.getFilePath());
// File should be marked for download and not returned
var libraryID = Zotero.Libraries.userLibraryID;
var changed = await Zotero.Sync.Storage.Local.checkForUpdatedFiles(libraryID, [item.id]);
await item.eraseTx();
assert.isTrue(changed);
assert.equal(item.attachmentSyncState, Zotero.Sync.Storage.Local.SYNC_STATE_TO_DOWNLOAD);
});
})
describe("#updateSyncStates()", function () {