scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-10-07 02:58:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Replace stale model files when the model revision changes

Browse source 
download() skipped every existing file, so after a revision bump the old
files were kept and then marked as the new revision. Stamp the directory
with the revision being downloaded and clear it on mismatch, so bumps
replace the files while interrupted downloads of the same revision still
resume.
This commit is contained in:
Dan Stillman 2026-07-20 15:49:36 -04:00
parent 356d36e4aa
commit 68431dee46
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
chrome/content/zotero/xpcom/embeddings.js
View file

@ -85,6 +85,11 @@ Zotero.Embeddings = new function () {
// that isDownloaded() doesn't have to re-check each file on every call.
const MARKER_FILE = '.download-complete.json';
// Written into the model directory before the first file is downloaded,
// so download() can tell a resumable partial download of the current
// revision from stale files that have to be replaced.
const REVISION_MARKER_FILE = '.download-revision.json';
const SUBDIR = 'embeddings';
/**
@ -375,9 +380,10 @@ Zotero.Embeddings = new function () {
};
/**
* Download the active model's files into its directory. Files that already
* exist are skipped, so this can be safely called again to resume after a
* failure. On success a completion marker is written.
* Download the active model's files into its directory. Files already
* downloaded for the same revision are skipped, so this can be safely
* called again to resume after a failure. On success a completion marker
* is written.
*
* @return {Promise<String>} - Path to the model directory
*/
@ -392,7 +398,21 @@ Zotero.Embeddings = new function () {
}
Zotero.debug(`Embeddings: downloading model '${this.getModelName()}' from ${baseURL}`);
// A revision marker is written before the first file, so files from a
// partial download of the same revision can be kept for resuming while
// anything else -- e.g. a complete download of an older revision,
// whose files _downloadFile() would otherwise keep -- is replaced
let revisionPath = PathUtils.join(dir, REVISION_MARKER_FILE);
let downloadingRevision = null;
try {
downloadingRevision = JSON.parse(await Zotero.File.getContentsAsync(revisionPath)).revision;
}
catch {}
if (downloadingRevision !== model.revision) {
await IOUtils.remove(dir, { recursive: true, ignoreAbsent: true });
}
await Zotero.File.createDirectoryIfMissingAsync(dir, { from: Zotero.DataDirectory.dir });
await Zotero.File.putContentsAsync(revisionPath, JSON.stringify({ revision: model.revision }));
for (let file of model.files) {
await _downloadFile(baseURL + file, dir, file);