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

File sync: Use filtered filename when renaming from multi-file ZIPs

Browse source 
Follow-up to bab0237727
This commit is contained in:
Dan Stillman 2025-08-28 03:47:01 -04:00
parent b50e18059b
commit 740a7601eb
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -794,6 +794,7 @@ Zotero.Sync.Storage.Local = {
var count = 0;
var itemFileName = item.attachmentFilename;
var filteredItemFileName = Zotero.File.getValidFileName(itemFileName);
var createdFiles = new Set();
var entries = zipReader.findEntries(null);
@ -842,13 +843,13 @@ Zotero.Sync.Storage.Local = {
// take our chances and use that name
if (count == 1 && !entries.hasMore() && itemFileName) {
// May not be necessary, but let's be safe
itemFileName = Zotero.File.getValidFileName(itemFileName);
if (itemFileName != filePath) {
let msg = "Renaming single file '" + filePath + "' in ZIP to known filename '" + itemFileName + "'";
if (filteredItemFileName != filePath) {
let msg = "Renaming single file '" + filePath + "' in ZIP to known filename '"
+ filteredItemFileName + "'";
Zotero.debug(msg, 2);
Components.utils.reportError(msg);
filePath = itemFileName;
destPath = OS.Path.join(PathUtils.parent(destPath), itemFileName);
filePath = filteredItemFileName;
destPath = OS.Path.join(PathUtils.parent(destPath), filteredItemFileName);
renamed = true;
primaryFile = true;
}
@ -970,14 +971,14 @@ Zotero.Sync.Storage.Local = {
zipFile.remove(false);
}
// If multiple files and none match known filename, but there's only one HTML file, rename it
if (!createdFiles.has(itemFileName)) {
Zotero.debug(`${itemFileName} not found among extracted files`);
// If no extracted files match the known filename, but there's only one HTML file, rename it
if (!createdFiles.has(filteredItemFileName)) {
Zotero.debug(`${filteredItemFileName} not found among extracted files`);
let htmlFiles = [...createdFiles].filter(x => /\.html?$/.test(x));
if (htmlFiles.length == 1) {
let destPath = PathUtils.join(parentDir, itemFileName);
let destPath = PathUtils.join(parentDir, filteredItemFileName);
try {
Zotero.debug(`Renaming ${htmlFiles[0]} to ${itemFileName}`);
Zotero.debug(`Renaming ${htmlFiles[0]} to ${filteredItemFileName}`);
yield IOUtils.move(PathUtils.join(parentDir, htmlFiles[0]), destPath);
returnFile = destPath;
}