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

Additional debug output for setting base directory

Browse source
This commit is contained in:
Dan Stillman 2018-08-19 22:49:09 -04:00
parent d5e7bae254
commit 8d5338db2d
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
chrome/content/zotero/preferences/preferences_advanced.js
View file

@ -584,6 +584,8 @@ Zotero_Preferences.Attachment_Base_Directory = {
changePath: Zotero.Promise.coroutine(function* (basePath) { changePath: Zotero.Promise.coroutine(function* (basePath) {
Zotero.debug(`New base directory is ${basePath}`);
// Find all current attachments with relative attachment paths // Find all current attachments with relative attachment paths
var sql = "SELECT itemID FROM itemAttachments WHERE linkMode=? AND path LIKE ?"; var sql = "SELECT itemID FROM itemAttachments WHERE linkMode=? AND path LIKE ?";
var params = [ var params = [
@ -634,15 +636,20 @@ Zotero_Preferences.Attachment_Base_Directory = {
// relative paths (or, if the new base directory is an ancestor or // relative paths (or, if the new base directory is an ancestor or
// descendant of the old one, new relative paths) // descendant of the old one, new relative paths)
if (attachmentPath && Zotero.File.directoryContains(basePath, attachmentPath)) { if (attachmentPath && Zotero.File.directoryContains(basePath, attachmentPath)) {
Zotero.debug(`Converting ${attachmentPath} to relative path`);
newAttachmentPaths[attachmentID] = relPath ? attachmentPath : null; newAttachmentPaths[attachmentID] = relPath ? attachmentPath : null;
numNewAttachments++; numNewAttachments++;
} }
// Existing relative attachments not within the new base directory // Existing relative attachments not within the new base directory
// will be converted to absolute paths // will be converted to absolute paths
else if (relPath && this.getPath()) { else if (relPath && this.getPath()) {
Zotero.debug(`Converting ${relPath} to absolute path`);
newAttachmentPaths[attachmentID] = attachmentPath; newAttachmentPaths[attachmentID] = attachmentPath;
numOldAttachments++; numOldAttachments++;
} }
else {
Zotero.debug(`${attachmentPath} is not within the base directory`);
}
} }
//Confirm change of the base path //Confirm change of the base path
@ -697,7 +704,7 @@ Zotero_Preferences.Attachment_Base_Directory = {
} }
// Set new data directory // Set new data directory
Zotero.debug("Setting new base directory"); Zotero.debug("Setting base directory to " + basePath);
Zotero.Prefs.set('baseAttachmentPath', basePath); Zotero.Prefs.set('baseAttachmentPath', basePath);
Zotero.Prefs.set('saveRelativeAttachmentPath', true); Zotero.Prefs.set('saveRelativeAttachmentPath', true);
// Resave all attachments on base path (so that their paths become relative) // Resave all attachments on base path (so that their paths become relative)